From d6b4aa6ff40c62231e88ec53049027ceb6648f7e Mon Sep 17 00:00:00 2001
From: Eric Nielsen <eric@amalgamar.com.br>
Date: Mon, 9 May 2022 18:36:03 -0500
Subject: [PATCH] v1.9.0

---
 CHANGELOG.md            | 11 ++++++++---
 src/tools/degit.zsh.erb |  4 ++--
 src/tools/git.zsh.erb   |  4 ++--
 src/zimfw.zsh.erb       |  2 +-
 zimfw.zsh               | 12 ++++++------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b091c94..f5ebadc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+_No unreleased changes._
+
+## [1.9.0] - 2022-05-09
+
 ### Added
 
-- `--on-pull` option to `zmodule`, which allows setting a command that is always triggered
-  after the module is installed or updated.
+- `--on-pull` option to `zmodule`, which allows setting a command that is always
+  triggered after the module is installed or updated.
 
 ## [1.8.0] - 2022-01-25
 
@@ -274,7 +278,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.8.0...HEAD
+[Unreleased]: https://github.com/zimfw/zimfw/compare/v1.9.0...HEAD
+[1.9.0]: https://github.com/zimfw/zimfw/compare/v1.8.0...v1.9.0
 [1.8.0]: https://github.com/zimfw/zimfw/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/zimfw/zimfw/compare/v1.6.2...v1.7.0
 [1.6.2]: https://github.com/zimfw/zimfw/compare/v1.6.1...v1.6.2
diff --git a/src/tools/degit.zsh.erb b/src/tools/degit.zsh.erb
index cb58593..fa639f0 100644
--- a/src/tools/degit.zsh.erb
+++ b/src/tools/degit.zsh.erb
@@ -21,11 +21,11 @@ print_okay() {
 
 handle() {
   if [[ -n ${ONPULL} ]]; then
-    if ! ERR=$(builtin cd -q ${DIR} 2>&1 && eval ${ONPULL} 2>&1); then
+    if ! ERR=$(builtin cd -q ${DIR} 2>&1 && builtin eval ${ONPULL} 2>&1); then
       print_error 'Error during on-pull' ${ERR}
       return 1
     elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then
-      set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
+      builtin set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
     fi
   fi
   print_okay "${@}"
diff --git a/src/tools/git.zsh.erb b/src/tools/git.zsh.erb
index b7fd8ab..048c79d 100644
--- a/src/tools/git.zsh.erb
+++ b/src/tools/git.zsh.erb
@@ -14,11 +14,11 @@ print_okay() {
 
 handle() {
   if [[ -n ${ONPULL} ]]; then
-    if ! ERR=$(builtin cd -q ${DIR} 2>&1 && eval ${ONPULL} 2>&1); then
+    if ! ERR=$(builtin cd -q ${DIR} 2>&1 && builtin eval ${ONPULL} 2>&1); then
       print_error 'Error during on-pull' ${ERR}
       return 1
     elif [[ ${PRINTLEVEL} -gt 1 && -n ${ERR} ]]; then
-      set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
+      builtin set ${1} ${2:+${2}$'\n'}"On-pull output:"$'\n'${ERR}
     fi
   fi
   print_okay "${@}"
diff --git a/src/zimfw.zsh.erb b/src/zimfw.zsh.erb
index e81296f..789fb35 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.0-SNAPSHOT"
+    @version = "1.9.0"
     @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 7d85e59..488f0e4 100644
--- a/zimfw.zsh
+++ b/zimfw.zsh
@@ -384,7 +384,7 @@ _zimfw_compile() {
 }
 
 _zimfw_info() {
-  print -R 'zimfw version: '${_zversion}' (built at 2022-05-07 21:29:52 UTC, previous commit is e0fe8ef)'
+  print -R 'zimfw version: '${_zversion}' (built at 2022-05-09 23:35:03 UTC, previous commit is 741bb78)'
   print -R 'ZIM_HOME:      '${ZIM_HOME}
   print -R 'Zsh version:   '${ZSH_VERSION}
   print -R 'System info:   '$(command uname -a)
@@ -517,11 +517,11 @@ print_okay() {
 
 handle() {
   if [[ -n \${ONPULL} ]]; then
-    if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && eval \${ONPULL} 2>&1); then
+    if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && builtin eval \${ONPULL} 2>&1); then
       print_error 'Error during on-pull' \${ERR}
       return 1
     elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then
-      set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
+      builtin set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
     fi
   fi
   print_okay \"\${@}\"
@@ -662,11 +662,11 @@ print_okay() {
 
 handle() {
   if [[ -n \${ONPULL} ]]; then
-    if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && eval \${ONPULL} 2>&1); then
+    if ! ERR=\$(builtin cd -q \${DIR} 2>&1 && builtin eval \${ONPULL} 2>&1); then
       print_error 'Error during on-pull' \${ERR}
       return 1
     elif [[ \${PRINTLEVEL} -gt 1 && -n \${ERR} ]]; then
-      set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
+      builtin set \${1} \${2:+\${2}$'\n'}\"On-pull output:\"$'\n'\${ERR}
     fi
   fi
   print_okay \"\${@}\"
@@ -754,7 +754,7 @@ esac
 
 zimfw() {
   builtin emulate -L zsh -o EXTENDED_GLOB
-  local -r _zversion='1.9.0-SNAPSHOT' zusage="Usage: %B${0}%b <action> [%B-q%b|%B-v%b]
+  local -r _zversion='1.9.0' 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.