Improving zsh versions of path-manip.

Author: ☈king

lib/path-manip

@@ -7,12 +7,16 @@ source ~/.../lib/tracefuncs
 
 # List each directory in your PATH, one per line
 ...path-list() {
-    local path_
-    local d
-    if [ "$#" -eq 1 ]; then eval path_=\$$1; else path_="$PATH"; fi
-    for d in `echo $path_ | sed -e 's/:/ /g'`; do
-        echo "$d"
-    done
+    if [ -n "$ZSH_VERSION" ]; then
+        printf "%s\n" $path
+    else
+        local path_
+        local d
+        if [ "$#" -eq 1 ]; then eval path_=\$$1; else path_="$PATH"; fi
+        for d in `echo $path_ | sed -e 's/:/ /g'`; do
+            echo "$d"
+        done
+    fi
 }
 
 # Remove a directory from your PATH
@@ -21,43 +25,56 @@ source ~/.../lib/tracefuncs
     ...debug "Removed $* from \$PATH"
 }
 ...quiet-path-remove() {
-    local path_
-    local d
-    local p=""
-    if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
-    for d in `echo $path_ | sed -e 's/:/ /g'`; do
-        if [ "$d" != "$1" ]; then
-            if [ "$p" = "" ]; then
-                p="$d"
-            else
-                p="$p:$d"
+    if [ -n "$ZSH_VERSION" ]; then
+        path=(${path:#$1})
+    else
+        local path_
+        local d
+        local p=""
+        if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
+        for d in `echo $path_ | sed -e 's/:/ /g'`; do
+            if [ "$d" != "$1" ]; then
+                if [ "$p" = "" ]; then
+                    p="$d"
+                else
+                    p="$p:$d"
+                fi
             fi
-        fi
-    done
-    if [ "$#" -eq 2 ]; then eval $2=\$p; else PATH="$p"; fi
+        done
+        if [ "$#" -eq 2 ]; then eval $2=\$p; else PATH="$p"; fi
+    fi
 }
 
 # Add a directory to the start of your PATH while removing old references.
 ...path-prepend() {
-    local path_
     ...quiet-path-remove $*
-    if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
-    path_="$1:$path_"
-    if [ "$#" -eq 2 ]; then eval "$2=$path_"; else PATH="$path_"; fi
+    if [ -n "$ZSH_VERSION" ]; then
+        path=($1 $path)
+    else
+        local path_
+        if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
+        path_="$1:$path_"
+        if [ "$#" -eq 2 ]; then eval "$2=$path_"; else PATH="$path_"; fi
+    fi
     ...debug "Prepended $* to \$PATH"
 }
 
 # Add a directory to the end of your PATH while removing old references.
 ...path-append() {
-    local path_
     ...quiet-path-remove $*
-    if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
-    path_="$path_:$1"
-    if [ "$#" -eq 2 ]; then eval $2=\$path_; else PATH="$path_"; fi
+    if [ -n "$ZSH_VERSION" ]; then
+        path=($path $1)
+    else
+        local path_
+        if [ "$#" -eq 2 ]; then eval path_=\$$2; else path_="$PATH"; fi
+        path_="$path_:$1"
+        if [ "$#" -eq 2 ]; then eval $2=\$path_; else PATH="$path_"; fi
+    fi
     ...debug "Appended $* to \$PATH"
 }
 
 # Copyright © 2011 Ingy dot Net <[email protected]>
 #
 # This library is free software, distributed under the ISC License.
 # See the LICENSE file distributed with this library.
+# vim:ft=zsh

t/_path-manip

@@ -0,0 +1,11 @@
+source ../lib/path-manip
+ok() { echo -n "$@ "; read; eval "$@"; ...path-list; }
+
+...path-list
+echo "# (☝ starting \$PATH)"
+ok ...path-prepend early
+ok ...path-remove early
+ok ...path-append late-then-early
+ok ...path-prepend late-then-early
+
+# vim:ft=zsh

t/path-manip

@@ -0,0 +1,7 @@
+#!/bin/sh
+echo "# This is a lazy test. Just look at the output to figure out if it's OK"
+echo "# bash"
+bash -c 'source _path-manip'
+echo
+echo "# now zsh"
+zsh -c 'source _path-manip'