+Want help with the complete zmodule
usage?
+
Usage: zmodule <url> [-n|--name <module_name>] [options]
Add zmodule calls to your ~/.zimrc file to define the modules to be initialized. The modules are
@@ -118,8 +151,14 @@ Initialization options:
command are substituted by the module root directory path.
I.e., -s 'script.zsh' and -c 'source {}/script.zsh' are equivalent.
-d|--disabled Don't initialize or uninstall the module.
+
+ Setting any initialization option above will disable all the default values from the other ini-
+ tialization options, so only your provided values are used. I.e. these values are either all
+ automatic, or all manual.
+
+
### zimfw
Added new modules to `~/.zimrc`? Run `zimfw install`.
@@ -155,3 +194,4 @@ remove the initialization lines from your `~/.zshenv`, `~/.zshrc` and `~/.zlogin
[blazing speed]: https://github.com/zimfw/zimfw/wiki/Speed
[modules]: https://zimfw.sh/docs/modules/
[themes]: https://zimfw.sh/docs/themes/
+[zimfw]: https://github.com/zimfw
diff --git a/src/stage2/80_zimfw.zsh.erb b/src/stage2/80_zimfw.zsh.erb
index f4784b0..541112a 100644
--- a/src/stage2/80_zimfw.zsh.erb
+++ b/src/stage2/80_zimfw.zsh.erb
@@ -11,9 +11,11 @@ Actions:
%Bhelp%b Print this help.
%Binfo%b Print Zim and system info.
%Blist%b List all modules. Use %B-v%b to also see the current details for all modules.
- %Binstall%b Install new modules. Also does %Bbuild%b, %Bcompile%b. Use %B-v%b to also see their output.
+ %Binstall%b Install new modules. Also does %Bbuild%b and %Bcompile%b. Use %B-v%b to also see their
+ output, and see skipped modules.
%Buninstall%b Delete unused modules. Prompts for confirmation. Use %B-q%b to uninstall quietly.
- %Bupdate%b Update current modules. Also does %Bbuild%b, %Bcompile%b. Use %B-v%b to see their output.
+ %Bupdate%b Update current modules. Also does %Bbuild%b and %Bcompile%b. Use %B-v%b to see their
+ output, and see skipped modules.
%Bupgrade%b Upgrade zimfw. Also does %Bcompile%b. Use %B-v%b to also see its output.
%Bversion%b Print zimfw version.
diff --git a/src/tools/degit.zsh.erb b/src/tools/degit.zsh.erb
index b832124..cfe75ca 100644
--- a/src/tools/degit.zsh.erb
+++ b/src/tools/degit.zsh.erb
@@ -110,7 +110,6 @@ case ${ACTION} in
}
;;
update)
- if [[ -r ${DIR}/.zim_degit_info ]] command mv -f ${DIR}/.zim_degit_info ${INFO_TARGET}
if [[ ! -r ${INFO_TARGET} ]]; then
if (( PRINTLEVEL > 0 )); then
print -u2 -PR <%= clear_line %>"%F{yellow}<%= warn %>%B${MODULE}:%b Module was not installed using Zim's degit. Will not try to update. You can disable this with the zmodule option -z|--frozen.%f"
diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb
index a63aab7..4cc4fa4 100644
--- a/src/zimfw.zsh.erb
+++ b/src/zimfw.zsh.erb
@@ -4,7 +4,7 @@ class Zim
:clear_line, :ellipsis, :okay, :warn, :error, :done, :failed
def initialize
- @version = "1.6.0-SNAPSHOT"
+ @version = "1.6.0"
@home = "${ZDOTDIR:-${HOME}}"
@min_zsh_version = "5.2"
@startup_files_glob = ".z(shenv|profile|shrc|login|logout)"
diff --git a/zimfw.zsh b/zimfw.zsh
index 78939ec..b646b22 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -373,7 +373,7 @@ _zimfw_compile() {
}
_zimfw_info() {
- print -R 'zimfw version: '${_zversion}' (built at 2021-10-26 15:35:30 UTC, previous commit is a86f69a)'
+ print -R 'zimfw version: '${_zversion}' (built at 2021-11-06 21:22:50 UTC, previous commit is 4259e64)'
print -R 'ZIM_HOME: '${ZIM_HOME}
print -R 'Zsh version: '${ZSH_VERSION}
print -R 'System info: '$(command uname -a)
@@ -594,7 +594,6 @@ case \${ACTION} in
}
;;
update)
- if [[ -r \${DIR}/.zim_degit_info ]] command mv -f \${DIR}/.zim_degit_info \${INFO_TARGET}
if [[ ! -r \${INFO_TARGET} ]]; then
if (( PRINTLEVEL > 0 )); then
print -u2 -PR $'\E[2K\r'\"%F{yellow}! %B\${MODULE}:%b Module was not installed using Zim's degit. Will not try to update. You can disable this with the zmodule option -z|--frozen.%f\"
@@ -717,7 +716,7 @@ esac
}
zimfw() {
- local -r _zversion='1.6.0-SNAPSHOT' zusage="Usage: %B${0}%b