diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-01-25 16:30:16 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-01-25 16:32:20 +1300 |
commit | ae16b1077311c228048f040f93977d3ae862340b (patch) | |
tree | 978fb422893c0237d37506f4d1ed42179db0fc65 | |
parent | Avoid a fork in options detection (diff) | |
download | dotfiles-ae16b1077311c228048f040f93977d3ae862340b.tar.gz dotfiles-ae16b1077311c228048f040f93977d3ae862340b.zip |
Add "pop" and "shift" methods to path()
-rw-r--r-- | IDEAS.markdown | 1 | ||||
-rw-r--r-- | bash/bash_completion.d/path.bash | 2 | ||||
-rw-r--r-- | sh/shrc.d/path.sh | 38 |
3 files changed, 39 insertions, 2 deletions
diff --git a/IDEAS.markdown b/IDEAS.markdown index 39d9511e..25b79516 100644 --- a/IDEAS.markdown +++ b/IDEAS.markdown @@ -8,5 +8,4 @@ Ideas manageable * Have eds(1df) accept stdin with the "starting content" for the script * Convert all the manual pages to mandoc maybe? <https://en.wikipedia.org/wiki/Mandoc> -* Add "pop" and "shift" methods to path() * edio(1df), like vipe(1) diff --git a/bash/bash_completion.d/path.bash b/bash/bash_completion.d/path.bash index a65e10ce..ba2dcb79 100644 --- a/bash/bash_completion.d/path.bash +++ b/bash/bash_completion.d/path.bash @@ -6,7 +6,7 @@ _path() { # Complete operation as first word local cmd - for cmd in list insert append remove check help ; do + for cmd in list insert append remove shift pop check help ; do [[ $cmd == "${COMP_WORDS[COMP_CWORD]}"* ]] || continue COMPREPLY[${#COMPREPLY[@]}]=$cmd done diff --git a/sh/shrc.d/path.sh b/sh/shrc.d/path.sh index 23eec75b..2759e11f 100644 --- a/sh/shrc.d/path.sh +++ b/sh/shrc.d/path.sh @@ -79,6 +79,40 @@ path() { PATH=${PATH%%:} ;; + # Remove the first directory in $PATH + shift) + case $PATH in + '') + printf >&2 'path(): %s: PATH is empty!\n' "$@" + return 1 + ;; + *:*) + PATH=${PATH#*:} + ;; + *) + # shellcheck disable=SC2123 + PATH= + ;; + esac + ;; + + # Remove the last directory in $PATH + pop) + case $PATH in + '') + printf >&2 'path(): %s: PATH is empty!\n' "$@" + return 1 + ;; + *:*) + PATH=${PATH%:*} + ;; + *) + # shellcheck disable=SC2123 + PATH= + ;; + esac + ;; + # Check whether a directory is in PATH check) path _argcheck "$@" || return @@ -103,6 +137,10 @@ USAGE: Add directory DIR (default $PWD) to the end of PATH path remove [DIR] Remove directory DIR (default $PWD) from PATH + path shift + Remove the first directory from PATH + path pop + Remove the last directory from PATH path check [DIR] Return whether directory DIR (default $PWD) is a component of PATH path help |