From 3ae4fec895e44945c94585e93543eaad6ae3cfee Mon Sep 17 00:00:00 2001 From: Eric Nielsen Date: Thu, 12 Dec 2019 08:46:27 -0500 Subject: [PATCH] Use builtin cd -q to bypass aliases and to avoid calling any chpwd hook functions. --- src/stage1/50_zimfw_compile.zsh.erb | 2 +- src/tools/update.zsh.erb | 2 +- zimfw.zsh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/stage1/50_zimfw_compile.zsh.erb b/src/stage1/50_zimfw_compile.zsh.erb index b9ba0f6..01ae6b8 100644 --- a/src/stage1/50_zimfw_compile.zsh.erb +++ b/src/stage1/50_zimfw_compile.zsh.erb @@ -18,7 +18,7 @@ _zimfw_compile() { zfile=(${zdir}/^(*.*)(N-.)) if [[ -w ${zdir:h} && -n ${zfile} ]]; then zfile=(${${(M)zfile%/*/*}#/}) - (cd ${zdir:h} && zrecompile -p ${1} ${zdir:t}.zwc ${zfile}) || return 1 + (builtin cd -q ${zdir:h} && zrecompile -p ${1} ${zdir:t}.zwc ${zfile}) || return 1 fi done diff --git a/src/tools/update.zsh.erb b/src/tools/update.zsh.erb index 14a3e3a..53876df 100644 --- a/src/tools/update.zsh.erb +++ b/src/tools/update.zsh.erb @@ -7,7 +7,7 @@ readonly REV=${5} readonly -i QUIET=${6} readonly CLEAR_LINE=$'\E[2K\r' (( ! QUIET )) && print -Rn ${CLEAR_LINE}"Updating ${MODULE} …" -if ! builtin cd ${DIR} 2>/dev/null; then +if ! builtin cd -q ${DIR} 2>/dev/null; then print -u2 -PR ${CLEAR_LINE}"%F{red}✗ %B${MODULE}:%b Not installed%f" return 1 fi diff --git a/zimfw.zsh b/zimfw.zsh index 80679b7..70c226b 100644 --- a/zimfw.zsh +++ b/zimfw.zsh @@ -52,7 +52,7 @@ _zimfw_compile() { zfile=(${zdir}/^(*.*)(N-.)) if [[ -w ${zdir:h} && -n ${zfile} ]]; then zfile=(${${(M)zfile%/*/*}#/}) - (cd ${zdir:h} && zrecompile -p ${1} ${zdir:t}.zwc ${zfile}) || return 1 + (builtin cd -q ${zdir:h} && zrecompile -p ${1} ${zdir:t}.zwc ${zfile}) || return 1 fi done @@ -265,7 +265,7 @@ _zimfw_clean_dumpfile() { } _zimfw_info() { - print 'Zim version: 1.0.0-SNAPSHOT (previous commit is 660b8cd)' + print 'Zim version: 1.0.0-SNAPSHOT (previous commit is bd8ae83)' print -R 'ZIM_HOME: '${ZIM_HOME} print -R 'Zsh version: '${ZSH_VERSION} print -R 'System info: '$(command uname -a) @@ -382,7 +382,7 @@ readonly REV=\${5} readonly -i QUIET=\${6} readonly CLEAR_LINE=$'\E[2K\r' (( ! QUIET )) && print -Rn \${CLEAR_LINE}\"Updating \${MODULE} …\" -if ! builtin cd \${DIR} 2>/dev/null; then +if ! builtin cd -q \${DIR} 2>/dev/null; then print -u2 -PR \${CLEAR_LINE}\"%F{red}✗ %B\${MODULE}:%b Not installed%f\" return 1 fi