X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=lib.sh;h=c1037be6d11d9f6496164076618e9f3cc06587f8;hb=ca85c784acf029235757ca7e9a42e4764831fca4;hp=31b56c066db9596df61488efd4e7a48a6c8cbeae;hpb=84f932c810dae9ba0dd948e3a90c2f90d1f4e24a;p=config%2Fdotfiles.git

diff --git a/lib.sh b/lib.sh
index 31b56c0..c1037be 100644
--- a/lib.sh
+++ b/lib.sh
@@ -14,7 +14,23 @@ m4=`which m4`
 # Check if the given program is installed. Returns 0 if it exists, 1
 # otherwise; so it can be used in if.
 installed() {
-    which $1 > /dev/null
+    which $1 | grep -E '^/' > /dev/null
+}
+
+# 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.
+os() {
+    if [ -f /etc/debian_version ]; then
+        echo debian
+    elif [ -f /etc/gentoo-release ]; then
+        echo gentoo
+    elif [ x`uname` = xDarwin ]; then
+        echo darwin
+    else
+        echo unsupported OS! >&2
+        return 1
+    fi
 }
 
 # Creates a symbolic link for file $1 in dirname of $2 with name of basenmae
@@ -60,6 +76,11 @@ link() {
 # to $1 with a warning at the beginning to not edit the generated file.
 #
 # All arguments (except the first which is the filename) are passed to m4.
+#
+# The following macros are defined: IF and FI. Example:
+#     IF(OS, debian)
+#         ...
+#     FI
 m4() {
     # First argument is file name.
     file=$1
@@ -75,7 +96,11 @@ m4() {
 
     # Process $1.m4 with m4 using the given options.
     echo "m4(): generating '$file' from '$file.m4' with options '$*'"
-    $m4 $* $file.m4 >> $file
+    # Add useful macros.
+    (echo "define(\`IF', \`ifelse(\`\$1', \`\$2',dnl')dnl
+define(\`FI', \`)dnl')dnl";
+        # Run the file (and the default macros) through m4.
+        cat $file.m4) | $m4 $* >> $file
 
     unset file
 }