From 35cd6f5f23b1fffa91a6fc09128a0fa4f94c96a1 Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Mon, 9 Aug 2021 22:28:13 -0500 Subject: [PATCH] Be careful with multiple variables in the same line as one cannot depend on the other. --- src/tools/degit.zsh.erb | 3 ++- zimfw.zsh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/degit.zsh.erb b/src/tools/degit.zsh.erb index 9585e23..fbff388 100644 --- a/src/tools/degit.zsh.erb +++ b/src/tools/degit.zsh.erb @@ -1,7 +1,8 @@ # This runs in a new shell readonly ACTION=${1} MODULE=${2} DIR=${3} URL=${4} REV=${6} CLEAR_LINE=<%= clear_line %> readonly -i PRINTLEVEL=${7} -readonly TEMP=.zdegit_${RANDOM} TARBALL_TARGET=${DIR}/${TEMP}_tarball.tar.gz INFO_TARGET=${DIR}/.zdegit +readonly TEMP=.zdegit_${RANDOM} +readonly TARBALL_TARGET=${DIR}/${TEMP}_tarball.tar.gz INFO_TARGET=${DIR}/.zdegit print_error() { print -u2 -PR ${CLEAR_LINE}"%F{red}<%= error %>%B${MODULE}:%b ${1}%f"${2:+$'\n'${(F):- ${(f)^2}}} diff --git a/zimfw.zsh b/zimfw.zsh index e765de3..50e53dc 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -334,7 +334,7 @@ _zimfw_compile() { } _zimfw_info() { - print -R 'zimfw version: '${_zversion}' (built at 2021-08-10 01:21:11 UTC, previous commit is 6700933)' + print -R 'zimfw version: '${_zversion}' (built at 2021-08-10 03:26:13 UTC, previous commit is f6b623f)' print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'Zsh version: '${ZSH_VERSION} print -R 'System info: '$(command uname -a) @@ -421,7 +421,8 @@ _zimfw_run_tool() { degit) zcmd="# This runs in a new shell readonly ACTION=\${1} MODULE=\${2} DIR=\${3} URL=\${4} REV=\${6} CLEAR_LINE=$'\E[2K\r' readonly -i PRINTLEVEL=\${7} -readonly TEMP=.zdegit_\${RANDOM} TARBALL_TARGET=\${DIR}/\${TEMP}_tarball.tar.gz INFO_TARGET=\${DIR}/.zdegit +readonly TEMP=.zdegit_\${RANDOM} +readonly TARBALL_TARGET=\${DIR}/\${TEMP}_tarball.tar.gz INFO_TARGET=\${DIR}/.zdegit print_error() { print -u2 -PR \${CLEAR_LINE}\"%F{red}x %B\${MODULE}:%b \${1}%f\"\${2:+$'\n'\${(F):- \${(f)^2}}}