X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=lib.sh;h=05341537363b6e2bf19ed44df8bd50c3d184a175;hp=6a619027db7e7ae1046a66be85f9b1102fc3ab3b;hb=9e4b2aff9242c3e72c714c3bf01c670b576e6627;hpb=bd997ea8d727d70df7e246595e55afa45902fb49

diff --git a/lib.sh b/lib.sh
index 6a61902..0534153 100644
--- a/lib.sh
+++ b/lib.sh
@@ -101,7 +101,7 @@ simple_cpp() {
             break
         fi
 
-        cmd="$cmd s/\b$x\b/\$ARGV[\$i]/g; \$i++;"
+        cmd="$cmd s/\\b$x\\b/\$ARGV[\$i]/g; \$i++;"
     done
 
     perl_line_filter "$cmd" -- "$@"
@@ -120,9 +120,9 @@ os() {
         echo debian
     elif test -f /etc/gentoo-release; then
         echo gentoo
-    elif test x`uname` = xSunOS; then
+    elif test x"`uname`" = xSunOS; then
         echo sun
-    elif test x`uname` = xFreeBSD; then
+    elif test x"`uname`" = xFreeBSD; then
         echo freebsd
     else
         echo 'unsupported OS!' >&2
@@ -140,7 +140,7 @@ link() {
 
     # Get all necessary paths.
     pwd=`pwd`
-    base=`printf '%s' "$2" | sed "s|\~|$HOME|"` # expand ~, some sh don't do it
+    base=`printf '%s' "$2" | sed "s|~|$HOME|"` # expand ~, some sh don't do it
     base=`dirname "$base"`
     source=`printf '%s' "$pwd/$1" | sed "s|$base/||"`
     target=`basename "$2"`
@@ -168,7 +168,7 @@ link() {
     ln -s "$source" "$target"
 
     # Go back to the directory where we were before.
-    cd "$pwd"
+    cd "$pwd" || return 1
 }
 
 # Generate a file from a source file using a given command. A warning not to
@@ -196,13 +196,15 @@ generate() {
         printf '%s: generating from "%s" (%s)\n' \
             "$file" "$file$extension" "$1"
 
-        echo '###################################'  >"$file"
-        echo '# WARNING! DO NOT EDIT THIS FILE! #' >>"$file"
-        echo '###################################' >>"$file"
-        echo >>"$file"
-        printf '# It was generated from "%s" on %s.\n' \
-            "$file$extension" "`date`" >>"$file"
-        echo >>"$file"
+        {
+            echo '###################################'
+            echo '# WARNING! DO NOT EDIT THIS FILE! #'
+            echo '###################################'
+            echo
+            printf '# It was generated from "%s" on %s.\n' \
+                "$file$extension" "`date`"
+            echo
+        } > "$file"
 
         file_tmp="$file"
     fi