X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=lib.sh;h=206f9954a3841041da04e8b4417dccf497b889dc;hp=1862444f7f560fd9b6eb1922da19423b01459fc0;hb=9571f95bc667454fab054ba67477d90ff323d87c;hpb=67e3a3758949c35f395284cb1cea41c4e17c3e95 diff --git a/lib.sh b/lib.sh index 1862444..206f995 100644 --- a/lib.sh +++ b/lib.sh @@ -11,11 +11,7 @@ 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() { - # Thanks to Rado in #awk on Freenode (2010-03-29 01:34) for the END tip to - # also work with empty stdin, and to prince_jammys in #awk on Freenode - # (2010-03-29 02:20) for a shorter syntax for "$0 !~". - which $1 2>&1 | awk '{ if (!/^\//) exit 1 } - END { if (NR == 0) exit 1 }' + [ x`which $1 2>&1 | cut -c 1` = x/ ] || return 1 } # Print the current OS. The following OS are supported at the moment: @@ -23,6 +19,7 @@ installed() { # - Gentoo (gentoo) # - Mac OS X (darwin) # - Solaris/OpenSolaris (sun) +# - FreeBSD (freebsd) # If an unsupported OS is used an error is printed. os() { if [ -f /etc/debian_version ]; then @@ -33,6 +30,8 @@ os() { echo darwin elif [ x`uname` = xSunOS ]; then echo sun + elif [ x`uname` = xFreeBSD ]; then + echo freebsd else echo unsupported OS! >&2 return 1