mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

35299: Improve effect of zfdir -r

Browse source
This commit is contained in:
Han Pingtian 2015-05-27 14:22:13 +08:00 committed by Peter Stephenson
parent 0a97508bf6
commit 2d86de91c1
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-05-27 Peter Stephenson <p.stephenson@samsung.com>
* Han Pingtian: 35299: Functions/Zftp/zfdir: improve effect of
zfdir -r.
2015-05-26 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
* 35289: Doc/Zsh/builtions.yo: fix typos in the description

7
Functions/Zftp/zfdir
View file

@ -62,7 +62,7 @@ for (( i = 1; i <= $#argv; i++ )); do
fi
done
if [[ $# -eq 0 ]]; then
if [[ $# -eq 0 && $redir -ne 1 ]]; then
# Cache it in the current directory file. This means that repeated
# calls to zfdir with no arguments always use a cached file.
if [[ -z $curdir ]]; then
@ -79,11 +79,12 @@ else
fi
file=$otherdir
newargs="$*"
if [[ -f $file && $redir != 1 && $force -ne 1 ]]; then
if [[ -f $file && -n $newargs && $force -ne 1 ]]; then
# Don't use the cached file if the arguments changed.
# Even in zfdir -r new_args ...
[[ $newargs = $zfconfig[otherargs_$ZFTP_SESSION] ]] || rm -f $file
fi
zfconfig[otherargs_$ZFTP_SESSION]=$newargs
[[ -n $newargs ]] && zfconfig[otherargs_$ZFTP_SESSION]=$newargs
fi
if [[ $force -eq 1 ]]; then