1 files changed, 77 insertions, 25 deletions

diff --git a/sh/shrc.d/path.sh b/sh/shrc.d/path.sh
index 3caabbc9..b6b1820f 100644
--- a/sh/shrc.d/path.sh
+++ b/sh/shrc.d/path.sh
@@ -1,20 +1,11 @@
 # Function to manage contents of PATH variable within the current shell
 path() {
 
-    # The second argument, the directory, can never have a colon
-    case $2 in
-        *:*)
-            printf >&2 'path(): %s illegal colon\n' "$2"
-            return 2
-            ;;
-    esac
-
     # Check first argument to figure out operation
     case $1 in
 
         # List current directories in PATH
         list|'') (
-            # shellcheck disable=SC2030
             path=$PATH:
             while [ -n "$path" ] ; do
                 dir=${path%%:*}
@@ -24,10 +15,28 @@ path() {
             done
             ) ;;
 
+        # Helper function checks directory argument makes sense
+        _argcheck)
+            shift
+            if [ "$#" -gt 2 ] ; then
+                printf >&2 'path(): %s: too many arguments\n' "$1"
+                return 2
+            fi
+            case $2 in
+                *:*)
+                    printf >&2 'path(): %s: %s contains colon\n' "$@"
+                    return 2
+                    ;;
+            esac
+            return 0
+            ;;
+
         # Add a directory at the start of $PATH
         insert)
+            [ "$#" -eq 2 ] || set -- "$1" "$PWD"
+            path _argcheck "$@" || return
             if path check "$2" ; then
-                printf >&2 'path(): %s already in PATH\n' "$2"
+                printf >&2 'path(): %s: %s already in PATH\n' "$@"
                 return 1
             fi
             PATH=${2}${PATH:+:"$PATH"}
@@ -35,8 +44,10 @@ path() {
 
         # Add a directory to the end of $PATH
         append)
+            [ "$#" -eq 2 ] || set -- "$1" "$PWD"
+            path _argcheck "$@" || return
             if path check "$2" ; then
-                printf >&2 'path(): %s already in PATH\n' "$2"
+                printf >&2 'path(): %s: %s already in PATH\n' "$@"
                 return 1
             fi
             PATH=${PATH:+"$PATH":}${2}
@@ -44,21 +55,59 @@ path() {
 
         # Remove a directory from $PATH
         remove)
+            [ "$#" -eq 2 ] || set -- "$1" "$PWD"
+            path _argcheck "$@" || return
             if ! path check "$2" ; then
-                printf >&2 'path(): %s not in PATH\n' "$2"
+                printf >&2 'path(): %s: %s not in PATH\n' "$@"
                 return 1
             fi
             PATH=$(
                 path=:$PATH:
                 path=${path%%:"$2":*}:${path#*:"$2":}
                 path=${path#:}
-                path=${path%:}
-                printf '%s\n' "$path"
+                printf '%s:' "$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
+            [ "$#" -eq 2 ] || set -- "$1" "$PWD"
             case :$PATH: in
                 *:"$2":*) return 0 ;;
             esac
@@ -73,23 +122,26 @@ path(): Manage contents of PATH variable
 USAGE:
   path [list]
     Print the current directories in PATH, one per line (default command)
-  path insert DIR
-    Add a directory to the front of PATH
-  path append DIR
-    Add a directory to the end of PATH
-  path remove DIR
-    Remove directory from PATH
-  path check DIR
-    Return whether DIR is a component of PATH
+  path insert [DIR]
+    Add directory DIR (default $PWD) to the front of PATH
+  path append [DIR]
+    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
-    Print this help message (also done if command not found)
+    Print this help message
 EOF
             ;;
 
         # Command not found
         *)
-            printf >&2 'path(): Unknown command\n'
-            path help >&2
+            printf >&2 'path(): %s: Unknown command (try "help")\n' "$1"
             return 2
             ;;
     esac