aboutsummaryrefslogtreecommitdiff
path: root/sh
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-01-25 21:05:19 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-01-25 21:05:19 +1300
commitcc5634afcf6590f947da526f408d1985fffeb16d (patch)
tree03b67d6c4fc4d54b5add6244b1efebc546f59432 /sh
parentMerge branch 'master' into port/bsd/freebsd (diff)
parentAdd "pop" and "shift" methods to path() (diff)
downloaddotfiles-cc5634afcf6590f947da526f408d1985fffeb16d.tar.gz
dotfiles-cc5634afcf6590f947da526f408d1985fffeb16d.zip
Merge branch 'master' into port/bsd/freebsd
Diffstat (limited to 'sh')
-rw-r--r--sh/profile.d/options.sh17
-rw-r--r--sh/shrc.d/path.sh38
2 files changed, 47 insertions, 8 deletions
diff --git a/sh/profile.d/options.sh b/sh/profile.d/options.sh
index 345888d0..a668a360 100644
--- a/sh/profile.d/options.sh
+++ b/sh/profile.d/options.sh
@@ -1,10 +1,13 @@
# Cache the options available to certain programs. Run all this in a subshell
# (none of its state needs to endure in the session)
(
-options() (
+options() {
# Check or create the directory to cache the options
+ # Shift the program name off; remaining arguments are the options to check
dir=$HOME/.cache/$1
+ prog=$1
+ shift
# Directory already exists; bail out
[ -d "$dir" ] && exit
@@ -14,18 +17,16 @@ options() (
cd -- "$dir" || exit
# Write the program's --help output to a file, even if it's empty
- "$1" --help </dev/null >help 2>/dev/null || exit
-
- # Shift the program name off; remaining arguments are the options to check
- shift
+ # This probably only works with GNU tools in general
+ "$prog" --help </dev/null >help 2>/dev/null || exit
- # Iterate through some useful options and create files to show they're
- # available if found in the help output
+ # Iterate through remaining arguments (desired options), creating files to
+ # show they're available if found in the help output
for opt ; do
command -p grep -q -- '[^[:alnum:]]--'"$opt"'[^[:alnum:]]' help &&
touch -- "$opt"
done
-)
+}
# Cache options for bc(1)
options bc \
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