lib.sh: Improve installed() to work with more which.

[config/dotfiles.git] / tests / lib.sh.test

diff --git a/tests/lib.sh.test b/tests/lib.sh.test
index 32bbd70c3d38f32c15bcfb4b693c1dfcbcaf4f4c..171c7c23ad583f21bf29f3c898fe7e628c230f17 100644 (file)
--- a/tests/lib.sh.test
+++ b/tests/lib.sh.test
@@ -3,21 +3,41 @@
 
 . ../lib.sh
 
-# Tests for installed() with hopefully proper exit codes (1 if the program was
-# not found).
+# which with proper exit codes and output to stdout.
+which() {
+    if [ $1 = ls ]; then
+        echo /bin/ls
+    else
+        echo no doesnt-exist in /usr/bin /bin /usr/sbin /sbin
+        (exit 1)
+    fi
+}
+echo stdout which
+installed ls && echo ls installed
+installed doesnt-exist && echo doesnt-exist installed
+
+# which with proper exit codes and output to stderr in case of an error.
+which() {
+    if [ $1 = ls ]; then
+        echo /bin/ls
+    else
+        echo no doesnt-exist in /usr/bin /bin /usr/sbin /sbin >&2
+        (exit 1)
+    fi
+}
+echo stderr which
 installed ls && echo ls installed
 installed doesnt-exist && echo doesnt-exist installed
 
-# Simulate BSD `which` like on Mac OS X which doesn't use exit codes.
-function which() {
-    echo Mac OS X which for $1 >&2
+# which with no proper exit codes and output to stdout in case of an error.
+which() {
     if [ $1 = ls ]; then
         echo /bin/ls
     else
         echo no doesnt-exist in /usr/bin /bin /usr/sbin /sbin
     fi
 }
-# Tests for installed() without exit codes.
+echo stupid which
 installed ls && echo ls installed
 installed doesnt-exist && echo doesnt-exist installed