X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=lib.sh;h=e1be32dc9d5ca45ed3a2868af8b4941674b1cc32;hb=c619e7cce2a60f2d435a783ba607ea7b421170b7;hp=da00cce8d2c9be6e4b13f77bbe638bb8718eb1de;hpb=6a5e872d70869768816fc9461b8c2b4a2087d046;p=config%2Fdotfiles.git

diff --git a/lib.sh b/lib.sh
index da00cce..e1be32d 100644
--- a/lib.sh
+++ b/lib.sh
@@ -11,12 +11,15 @@ unset LS_COLORS
 # Check if the given program is installed. Returns 0 if it exists, 1
 # otherwise; so it can be used in if.
 installed() {
-    which $1 | grep -E '^/' > /dev/null
+    which $1 2>&1 | perl -ne 'if (not m{^/}) { exit 1 }'
 }
 
-# Prints the current OS. Supported are Debian (debian), Gentoo (gentoo) and
-# Mac OS X (darwin) at the moment. If an unsupported OS is used an error is
-# printed.
+# Print the current OS. The following OS are supported at the moment:
+# - Debian (debian)
+# - Gentoo (gentoo)
+# - Mac OS X (darwin)
+# - Solaris/OpenSolaris (sun)
+# If an unsupported OS is used an error is printed.
 os() {
     if [ -f /etc/debian_version ]; then
         echo debian
@@ -24,6 +27,8 @@ os() {
         echo gentoo
     elif [ x`uname` = xDarwin ]; then
         echo darwin
+    elif [ x`uname` = xSunOS ]; then
+        echo sun
     else
         echo unsupported OS! >&2
         return 1