diff --git a/README.md b/README.md index 2208126..41bdbbd 100644 --- a/README.md +++ b/README.md @@ -83,29 +83,29 @@ Usage: zmodule <url> [-n|--name< Add zmodule calls to your ~/.zimrc file to define the modules to be initialized. The modules are initialized in the same order they are defined. - <url> Module absolute path or repository URL. The following URL formats - are equivalent: name, zimfw/name, https://github.com/zimfw/name.git. - -n|--name <module_name> Set a custom module name. Default: the last component in the <url>. + <url> Module absolute path or repository URL. The following URL formats + are equivalent: name, zimfw/name, https://github.com/zimfw/name.git. + -n|--name <module_name> Set a custom module name. Default: the last component in the <url>. Repository options: - -b|--branch <branch_name> Use specified branch when installing and updating the module. - Overrides the tag option. Default: master. - -t|--tag <tag_name> Use specified tag when installing and updating the module. - Overrides the branch option. - -z|--frozen Don't install or update the module. + -b|--branch <branch_name> Use specified branch when installing and updating the module. + Overrides the tag option. Default: master. + -t|--tag <tag_name> Use specified tag when installing and updating the module. + Overrides the branch option. + -z|--frozen Don't install or update the module. Initialization options: - -f|--fpath <path> Add specified path to fpath. The path is relative to the module - root directory. Default: functions, if the subdirectory exists. - -a|--autoload <function_name> Autoload specified function. Default: all valid names inside the - module's specified fpath paths. - -s|--source <file_path> Source specified file. The file path is relative to the module root - directory. Default: the file with largest size matching - {init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}, if any exist. - -c|--cmd <command> Execute specified command. Occurrences of the {} placeholder in the - command are substituted by the module root directory path. - -s 'script.zsh' and -c 'source {}/script.zsh' are equivalent. - -d|--disabled Don't initialize or uninstall the module. + -f|--fpath <path> Add specified path to fpath. The path is relative to the module + root directory. Default: functions, if the subdirectory exists. + -a|--autoload <func_name> Autoload specified function. Default: all valid names inside the + module's specified fpath paths. + -s|--source <file_path> Source specified file. The file path is relative to the module root + directory. Default: the file with largest size matching + {init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}, if any exist. + -c|--cmd <command> Execute specified command. Occurrences of the {} placeholder in the + command are substituted by the module root directory path. + -s 'script.zsh' and -c 'source {}/script.zsh' are equivalent. + -d|--disabled Don't initialize or uninstall the module. ### zimfw diff --git a/src/stage2/30_zmodule.zsh.erb b/src/stage2/30_zmodule.zsh.erb index 73b5563..8309183 100644 --- a/src/stage2/30_zmodule.zsh.erb +++ b/src/stage2/30_zmodule.zsh.erb @@ -4,29 +4,29 @@ zmodule() { Add %Bzmodule%b calls to your %B${ZDOTDIR:-${HOME}}/.zimrc%b file to define the modules to be initialized. The modules are initialized in the same order they are defined. - Module absolute path or repository URL. The following URL formats - are equivalent: %Bname%b, %Bzimfw/name%b, %Bhttps://github.com/zimfw/name.git%b. - %B-n%b|%B--name%b Set a custom module name. Default: the last component in the . + Module absolute path or repository URL. The following URL formats + are equivalent: %Bname%b, %Bzimfw/name%b, %Bhttps://github.com/zimfw/name.git%b. + %B-n%b|%B--name%b Set a custom module name. Default: the last component in the . Repository options: - %B-b%b|%B--branch%b Use specified branch when installing and updating the module. - Overrides the tag option. Default: %Bmaster%b. - %B-t%b|%B--tag%b Use specified tag when installing and updating the module. - Overrides the branch option. - %B-z%b|%B--frozen%b Don't install or update the module. + %B-b%b|%B--branch%b Use specified branch when installing and updating the module. + Overrides the tag option. Default: %Bmaster%b. + %B-t%b|%B--tag%b Use specified tag when installing and updating the module. + Overrides the branch option. + %B-z%b|%B--frozen%b Don't install or update the module. Initialization options: - %B-f%b|%B--fpath%b Add specified path to fpath. The path is relative to the module - root directory. Default: %Bfunctions%b, if the subdirectory exists. - %B-a%b|%B--autoload%b Autoload specified function. Default: all valid names inside the - module's specified fpath paths. - %B-s%b|%B--source%b Source specified file. The file path is relative to the module root - directory. Default: the file with largest size matching - %B{init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}%b, if any exist. - %B-c%b|%B--cmd%b Execute specified command. Occurrences of the %B{}%b placeholder in the - command are substituted by the module root directory path. - %B-s 'script.zsh'%b and %B-c 'source {}/script.zsh'%b are equivalent. - %B-d%b|%B--disabled%b Don't initialize or uninstall the module. + %B-f%b|%B--fpath%b Add specified path to fpath. The path is relative to the module + root directory. Default: %Bfunctions%b, if the subdirectory exists. + %B-a%b|%B--autoload%b Autoload specified function. Default: all valid names inside the + module's specified fpath paths. + %B-s%b|%B--source%b Source specified file. The file path is relative to the module root + directory. Default: the file with largest size matching + %B{init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}%b, if any exist. + %B-c%b|%B--cmd%b Execute specified command. Occurrences of the %B{}%b placeholder in the + command are substituted by the module root directory path. + %B-s 'script.zsh'%b and %B-c 'source {}/script.zsh'%b are equivalent. + %B-d%b|%B--disabled%b Don't initialize or uninstall the module. " if [[ ${${funcfiletrace[1]%:*}:t} != .zimrc ]]; then print -u2 -PR "%F{red}${0}: Must be called from %B<%= home %>/.zimrc%b%f"$'\n\n'${zusage} diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb index 54ee2e5..ff8394d 100644 --- a/src/zimfw.zsh.erb +++ b/src/zimfw.zsh.erb @@ -6,7 +6,7 @@ class Zim @home = "${ZDOTDIR:-${HOME}}" @min_zsh_version = "5.2" @startup_files_glob = ".z(shenv|profile|shrc|login|logout)" - @version = "1.3.2" + @version = "1.3.3-SNAPSHOT" @ellipsis = " ..." @okay = "%F{green})%f " @warn = "! " diff --git a/zimfw.zsh b/zimfw.zsh index d710d70..6ef515c 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -107,29 +107,29 @@ zmodule() { Add %Bzmodule%b calls to your %B${ZDOTDIR:-${HOME}}/.zimrc%b file to define the modules to be initialized. The modules are initialized in the same order they are defined. - Module absolute path or repository URL. The following URL formats - are equivalent: %Bname%b, %Bzimfw/name%b, %Bhttps://github.com/zimfw/name.git%b. - %B-n%b|%B--name%b Set a custom module name. Default: the last component in the . + Module absolute path or repository URL. The following URL formats + are equivalent: %Bname%b, %Bzimfw/name%b, %Bhttps://github.com/zimfw/name.git%b. + %B-n%b|%B--name%b Set a custom module name. Default: the last component in the . Repository options: - %B-b%b|%B--branch%b Use specified branch when installing and updating the module. - Overrides the tag option. Default: %Bmaster%b. - %B-t%b|%B--tag%b Use specified tag when installing and updating the module. - Overrides the branch option. - %B-z%b|%B--frozen%b Don't install or update the module. + %B-b%b|%B--branch%b Use specified branch when installing and updating the module. + Overrides the tag option. Default: %Bmaster%b. + %B-t%b|%B--tag%b Use specified tag when installing and updating the module. + Overrides the branch option. + %B-z%b|%B--frozen%b Don't install or update the module. Initialization options: - %B-f%b|%B--fpath%b Add specified path to fpath. The path is relative to the module - root directory. Default: %Bfunctions%b, if the subdirectory exists. - %B-a%b|%B--autoload%b Autoload specified function. Default: all valid names inside the - module's specified fpath paths. - %B-s%b|%B--source%b Source specified file. The file path is relative to the module root - directory. Default: the file with largest size matching - %B{init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}%b, if any exist. - %B-c%b|%B--cmd%b Execute specified command. Occurrences of the %B{}%b placeholder in the - command are substituted by the module root directory path. - %B-s 'script.zsh'%b and %B-c 'source {}/script.zsh'%b are equivalent. - %B-d%b|%B--disabled%b Don't initialize or uninstall the module. + %B-f%b|%B--fpath%b Add specified path to fpath. The path is relative to the module + root directory. Default: %Bfunctions%b, if the subdirectory exists. + %B-a%b|%B--autoload%b Autoload specified function. Default: all valid names inside the + module's specified fpath paths. + %B-s%b|%B--source%b Source specified file. The file path is relative to the module root + directory. Default: the file with largest size matching + %B{init.zsh,module_name.{zsh,plugin.zsh,zsh-theme,sh}}%b, if any exist. + %B-c%b|%B--cmd%b Execute specified command. Occurrences of the %B{}%b placeholder in the + command are substituted by the module root directory path. + %B-s 'script.zsh'%b and %B-c 'source {}/script.zsh'%b are equivalent. + %B-d%b|%B--disabled%b Don't initialize or uninstall the module. " if [[ ${${funcfiletrace[1]%:*}:t} != .zimrc ]]; then print -u2 -PR "%F{red}${0}: Must be called from %B${ZDOTDIR:-${HOME}}/.zimrc%b%f"$'\n\n'${zusage} @@ -315,7 +315,7 @@ _zimfw_compile() { } _zimfw_info() { - print -R 'zimfw version: '${_zversion}' (previous commit is ccace0c)' + print -R 'zimfw version: '${_zversion}' (previous commit is fbf0fe0)' print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'Zsh version: '${ZSH_VERSION} print -R 'System info: '$(command uname -a) @@ -359,7 +359,7 @@ _zimfw_upgrade() { } zimfw() { - local -r _zversion='1.3.2' + local -r _zversion='1.3.3-SNAPSHOT' local -r zusage="Usage: %B${0}%b [%B-q%b|%B-v%b] Actions: