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

diff --git a/lib.sh b/lib.sh
index e1be32d..1862444 100644
--- a/lib.sh
+++ b/lib.sh
@@ -11,7 +11,11 @@ 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 2>&1 | perl -ne 'if (not m{^/}) { exit 1 }'
+    # 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 }'
 }
 
 # Print the current OS. The following OS are supported at the moment:
@@ -43,7 +47,8 @@ os() {
 link() {
     # Get all necessary paths.
     pwd=`pwd`
-    base=`dirname "$2"`
+    base=`echo "$2" | sed "s|\~|$HOME|"` # expand ~, some sh don't do it
+    base=`dirname "$base"`
     source=`echo "$pwd/$1" | sed "s|$base/||"`
     target=`basename "$2"`
 
@@ -52,13 +57,14 @@ link() {
 
     # Abort if the target file exists and is no symbolic link. Prevents
     # overwriting real files.
-    if [ -e "$target" -a ! -h "$target" ]; then
+    if [ \( -f "$target" -a ! -h "$target" \) -o \
+         \( -s "$target" -a ! -h "$target" \) ]; then
         echo "link(): target '$target' exists already and is no symbolic link!" >&2
         exit 1
     fi
 
-    # Make sure the source exists.
-    if [ ! -e "$source" ]; then
+    # Make sure the source exists (is file, directory or link).
+    if [ ! -f "$source" -a ! -d "$source" -a ! -h "$source" ]; then
         echo "link(): source '$source' doesn't exist!" >&2
         exit 1
     fi