From: Simon Ruderich Date: Sun, 7 Mar 2010 21:03:53 +0000 (+0100) Subject: lib.sh: Add support for less capable sh/test. X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=28014a7a3978f84082fb7e979357e3ff56435887;p=config%2Fdotfiles.git lib.sh: Add support for less capable sh/test. --- diff --git a/lib.sh b/lib.sh index e1be32d..d9b14c5 100644 --- a/lib.sh +++ b/lib.sh @@ -43,7 +43,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 +53,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