From b4b9829360ddff738dd76ede6efe059e69763841 Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Fri, 19 Mar 2021 18:44:53 -0500 Subject: [PATCH] v1.4.3 --- CHANGELOG.md | 13 +++++++++---- README.md | 3 ++- src/stage2/30_zmodule.zsh.erb | 3 ++- src/zimfw.zsh.erb | 2 +- zimfw.zsh | 7 ++++--- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b535a3b..a88fa27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +_No unreleased changes._ + +## [1.4.3] - 2021-03-19 + ### Fixed - Prefer the prezto module format when using defaults to initialize a module. - This is the format we use in our Zim framework modules. It's is not well - documented anywhere officially, but in short words a prezto module has: + This is the format we use in our Zim framework modules. It's not well + documented anywhere officially, but in short words a prezto module can have: * a `functions` subdirectory that is added to the fpath by the framework, * files inside the `functions` subdirectory that are autoloaded by the - framework (except for file names that match `_*` or `prompt_*_setup`), + framework (except for those with names matching `_*` or `prompt_*_setup`), * an `init.zsh` file that is sourced by the framework. ## [1.4.2] - 2021-02-19 @@ -170,7 +174,8 @@ Take your time to review the updated [README.md] and the changes listed below. [termtitle]: https://github.com/zimfw/termtitle [s1ck94]: https://github.com/zimfw/s1ck94 -[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.4.2...HEAD +[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.4.3...HEAD +[1.4.3]: https://github.com/zimfw/zimfw/compare/v1.4.2...v1.4.3 [1.4.2]: https://github.com/zimfw/zimfw/compare/v1.4.1...v1.4.2 [1.4.1]: https://github.com/zimfw/zimfw/compare/v1.4.0...v1.4.1 [1.4.0]: https://github.com/zimfw/zimfw/compare/v1.3.2...v1.4.0 diff --git a/README.md b/README.md index 9df3713..02b3d59 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,8 @@ Initialization options: -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 + directory. Default: init.zsh, if the functions subdirectory also + exists, or 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. diff --git a/src/stage2/30_zmodule.zsh.erb b/src/stage2/30_zmodule.zsh.erb index 3aaedde..8efc942 100644 --- a/src/stage2/30_zmodule.zsh.erb +++ b/src/stage2/30_zmodule.zsh.erb @@ -21,7 +21,8 @@ Initialization options: %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 + directory. Default: %Binit.zsh%b, if the %Bfunctions%b subdirectory also + exists, or 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. diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb index 8c24f1b..a97243d 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.4.3-SNAPSHOT" + @version = "1.4.3" @ellipsis = " ..." @okay = "%F{green})%f " @warn = "! " diff --git a/zimfw.zsh b/zimfw.zsh index 3b2004e..8777e2d 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -128,7 +128,8 @@ Initialization options: %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 + directory. Default: %Binit.zsh%b, if the %Bfunctions%b subdirectory also + exists, or 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. @@ -328,7 +329,7 @@ _zimfw_compile() { } _zimfw_info() { - print -R 'zimfw version: '${_zversion}' (built at 2021-03-19 23:11:36 UTC, previous commit is 65783e6)' + print -R 'zimfw version: '${_zversion}' (built at 2021-03-19 23:42:38 UTC, previous commit is 163d36b)' print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'Zsh version: '${ZSH_VERSION} print -R 'System info: '$(command uname -a) @@ -375,7 +376,7 @@ _zimfw_upgrade() { } zimfw() { - local -r _zversion='1.4.3-SNAPSHOT' + local -r _zversion='1.4.3' local -r zusage="Usage: %B${0}%b [%B-q%b|%B-v%b] Actions: