diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-10-14 14:23:16 +0100 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-10-14 14:23:16 +0100 |
| commit | bab1fc50436f23402696cd5236c0689c4d4dbd59 (patch) | |
| tree | c183794122a8af5a982fed52ce06a707d7a8cbd9 /Functions | |
| parent | 643aca932aa30083246312eeddd2e0d6befa5861 (diff) | |
| download | zsh-bab1fc50436f23402696cd5236c0689c4d4dbd59.tar.gz zsh-bab1fc50436f23402696cd5236c0689c4d4dbd59.tar.xz zsh-bab1fc50436f23402696cd5236c0689c4d4dbd59.zip | |
36856: cdr -p/-P to prune directory list
Diffstat (limited to 'Functions')
| -rw-r--r-- | Functions/Chpwd/cdr | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/Functions/Chpwd/cdr b/Functions/Chpwd/cdr index 4f399106b..4bed88b13 100644 --- a/Functions/Chpwd/cdr +++ b/Functions/Chpwd/cdr @@ -51,6 +51,13 @@ # (and only /). Usually the first entry should be left as the current # directory. # +# "cdr -p 'pattern'" prunes anything matching the given extended glob +# pattern from the directory list. The match is against the fully +# expanded directory path and the full string must match (use wildcards +# at the ends if needed). If output is going to a terminal, the +# function will print the new list for the user to confrim; this can be +# skipped by giving -P instead of -p. +# # Details of directory handling # ============================= # @@ -217,11 +224,11 @@ setopt extendedglob autoload -Uz chpwd_recent_filehandler chpwd_recent_add -integer list set_reply i bad edit -local opt dir +integer list set_reply i bad edit force_prune +local opt dir prune local -aU dirs -while getopts "elr" opt; do +while getopts "elp:P:r" opt; do case $opt in (e) edit=1 @@ -231,6 +238,12 @@ while getopts "elr" opt; do list=1 ;; + ([pP]) + prune=$OPTARG + edit=1 + [[ $opt = P ]] && force_prune=1 + ;; + (r) set_reply=1 ;; @@ -278,10 +291,22 @@ if [[ $PWD != $reply[1] ]]; then fi if (( edit )); then - local compcontext='directories:directory:_path_files -/' -IFS=' + if [[ -n $prune ]]; then + reply=(${reply:#$~prune}) + if [[ force_prune -eq 0 && -t 1 ]]; then + print -nrl "New list:" $reply 'Accept? ' + if ! read -q; then + print + return 1 + fi + print + fi + else + local compcontext='directories:directory:_path_files -/' + IFS=' ' vared reply || return 1 -chpwd_recent_filehandler $reply + fi + chpwd_recent_filehandler $reply fi # Skip current directory if present (may have been pruned). |