From a62095355641cba530be4c42a333bd048a12d953 Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Tue, 24 May 2022 16:25:32 -0500
Subject: [PATCH] v1.9.1

---
 CHANGELOG.md                               | 16 ++++++++++------
 src/stage2/50_zimfw_install_update.zsh.erb |  3 ++-
 src/zimfw.zsh.erb                          |  2 +-
 zimfw.zsh                                  |  7 ++++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbefc16..670ec33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+_No unreleased changes._
+
+## [1.9.1] - 2022-05-24
+
 ### Fixed
 
-- Calling `zmodule` more than once will override the repository options along
-  the calls for the same module name.
-- Also show skipping already installed modules with the install action and `-v`.
-- Also consider external module directory paths when calling the compile action
-  directly.
-- Ignore return value from `zargs` with `-P`.
+- Override repository options along multiple `zmodule` calls with the same
+  module name.
+- Show already installed modules skipped with install action and `-v`.
+- Consider external module directory paths when calling compile action directly.
+- Ignore return value from `zargs` with `-P`
+  (See https://www.zsh.org/mla/workers/2022/msg00611.html)
 
 ## [1.9.0] - 2022-05-09
 
diff --git a/src/stage2/50_zimfw_install_update.zsh.erb b/src/stage2/50_zimfw_install_update.zsh.erb
index a02fe9b..f7f7bcf 100644
--- a/src/stage2/50_zimfw_install_update.zsh.erb
+++ b/src/stage2/50_zimfw_install_update.zsh.erb
@@ -1,6 +1,7 @@
 _zimfw_install_update() {
   local -r _zargs_action=${1}
   _zimfw_source_zimrc 1 && zargs -n 1 -P 0 -- "${_znames[@]}" -- _zimfw_run_tool
-  # Ignore return from zargs with -P
+  # Ignore return from zargs with -P. Was missing values before zsh 5.9, and
+  # it's intermittently failing in zsh 5.9 and macOS. See https://www.zsh.org/mla/workers/2022/msg00611.html
   return 0
 }
diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb
index d43df29..9ae1d01 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.9.1-SNAPSHOT"
+    @version = "1.9.1"
     @home = "${ZDOTDIR:-${HOME}}"
     @min_zsh_version = "5.2"
     # Matches {ssh,http,https,git}://{user@,}host/org/repo and {user@,}host:org/repo
diff --git a/zimfw.zsh b/zimfw.zsh
index 404a92a..6743857 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -384,7 +384,7 @@ _zimfw_compile() {
 }
 
 _zimfw_info() {
-  print -R 'zimfw version: '${_zversion}' (built at 2022-05-17 23:38:19 UTC, previous commit is d6b4aa6)'
+  print -R 'zimfw version: '${_zversion}' (built at 2022-05-24 21:25:10 UTC, previous commit is 5bcfb8c)'
   print -R 'ZIM_HOME:      '${ZIM_HOME}
   print -R 'Zsh version:   '${ZSH_VERSION}
   print -R 'System info:   '$(command uname -a)
@@ -393,7 +393,8 @@ _zimfw_info() {
 _zimfw_install_update() {
   local -r _zargs_action=${1}
   _zimfw_source_zimrc 1 && zargs -n 1 -P 0 -- "${_znames[@]}" -- _zimfw_run_tool
-  # Ignore return from zargs with -P
+  # Ignore return from zargs with -P. Was missing values before zsh 5.9, and
+  # it's intermittently failing in zsh 5.9 and macOS. See https://www.zsh.org/mla/workers/2022/msg00611.html
   return 0
 }
 
@@ -755,7 +756,7 @@ esac
 
 zimfw() {
   builtin emulate -L zsh -o EXTENDED_GLOB
-  local -r _zversion='1.9.1-SNAPSHOT' zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b]
+  local -r _zversion='1.9.1' zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b]
 
 Actions:
   %Bbuild%b           Build %B${ZIM_HOME}/init.zsh%b and %B${ZIM_HOME}/login_init.zsh%b.