psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-22 23:35:35 -05:00
Code Issues Releases Wiki Activity

Fix git log in zimfw update not showing backtick

Browse source 
because it was being processed as the beginning of a escape sequence.
Using `print -R` fixes that. Probably a good idea to use it when
printing other messages that contain externally-generated output.
This commit is contained in:
Eric Nielsen 2019-08-01 18:19:39 -05:00
parent 1980ca091d
commit e7ba68511a
No known key found for this signature in database
GPG key ID: 47D1DBFA0765A1FB
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/tools/update.zsh.erb
View file

@ -49,10 +49,11 @@ if [[ ${TYPE} == branch ]]; then
else else
OUT="Updating to ${TYPE} ${REV}" OUT="Updating to ${TYPE} ${REV}"
fi fi
[[ -n ${LOG} ]] && OUT="${OUT}\n${LOG}" [[ -n ${LOG} ]] && OUT="${OUT}
${LOG}"
if ERR=$(command git submodule update --init --recursive -q 2>&1); then if ERR=$(command git submodule update --init --recursive -q 2>&1); then
if [[ ${OPT} != -q ]]; then if [[ ${OPT} != -q ]]; then
print -P "${CLEAR_LINE}%F{green}✓%f ${MODULE}: ${OUT}" print -R "$(print -P "${CLEAR_LINE}%F{green}✓%f") ${MODULE}: ${OUT}"
fi fi
else else
print -P "${CLEAR_LINE}%F{red}✗ ${MODULE}: Error (4)%f\n${ERR}" print -P "${CLEAR_LINE}%F{red}✗ ${MODULE}: Error (4)%f\n${ERR}"

7
zimfw.zsh
View file

@ -182,7 +182,7 @@ _zimfw_clean_dumpfile() {
} }
_zimfw_info() { _zimfw_info() {
print 'Zim version: 1.0.0-SNAPSHOT (previous commit is a1291c5)' print 'Zim version: 1.0.0-SNAPSHOT (previous commit is 3af566d)'
print "Zsh version: ${ZSH_VERSION}" print "Zsh version: ${ZSH_VERSION}"
print "System info: $(command uname -a)" print "System info: $(command uname -a)"
} }
@ -306,10 +306,11 @@ if [[ \${TYPE} == branch ]]; then
else else
OUT=\"Updating to \${TYPE} \${REV}\" OUT=\"Updating to \${TYPE} \${REV}\"
fi fi
[[ -n \${LOG} ]] && OUT=\"\${OUT}\n\${LOG}\" [[ -n \${LOG} ]] && OUT=\"\${OUT}
\${LOG}\"
if ERR=\$(command git submodule update --init --recursive -q 2>&1); then if ERR=\$(command git submodule update --init --recursive -q 2>&1); then
if [[ \${OPT} != -q ]]; then if [[ \${OPT} != -q ]]; then
print -P \"\${CLEAR_LINE}%F{green}✓%f \${MODULE}: \${OUT}\" print -R \"\$(print -P \"\${CLEAR_LINE}%F{green}✓%f\") \${MODULE}: \${OUT}\"
fi fi
else else
print -P \"\${CLEAR_LINE}%F{red}✗ \${MODULE}: Error (4)%f\n\${ERR}\" print -P \"\${CLEAR_LINE}%F{red}✗ \${MODULE}: Error (4)%f\n\${ERR}\"