setup: Give up and use absolute links. It just works better.

diff --git a/setup b/setup
index 633336f567d3a170a24c9b6573832ae6d2cf0794..03f5671a9b2e046d3c8ecdfc5568f6ac37a3a283 100755 (executable)
--- a/setup
+++ b/setup
@@ -4,7 +4,7 @@ set -e
 
 umask 002
 
 
 umask 002
 

-sub= up=;
+sub=

 mkdir -p $HOME$sub
 
 : ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw}
 mkdir -p $HOME$sub
 
 : ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw}


@@ -26,11 +26,6 @@ done
 
 ### Find out where I am
 here=$(pwd)
 
 ### Find out where I am
 here=$(pwd)

-case "$here" in
-  $HOME/*) ;;
-  *) echo >&2 "$0: must be below $HOME"; exit 1;;
-esac
-down=$(echo $here | sed "s#^$HOME/##")

 
 ### Suss out how to print things
 out=$(echo -n "foo"; echo "bar")
 
 ### Suss out how to print things
 out=$(echo -n "foo"; echo "bar")


@@ -145,7 +140,7 @@ echo "Installing dotfiles..."
 for d in $dotfiles; do
   [ -f $d ]
   rm -f "$HOME$sub/.$d"
 for d in $dotfiles; do
   [ -f $d ]
   rm -f "$HOME$sub/.$d"

-  ln -s $up$down/$d $HOME$sub/.$d
+  ln -s $here/$d $HOME$sub/.$d

   echo "  .$d"
 done
 echo "  all done."
   echo "  .$d"
 done
 echo "  all done."


@@ -177,7 +172,7 @@ for link in dot-emacs.el:dot-emacs.el emacs-Makefile:Makefile; do
   set -- $(echo $link | tr : ' ')
   from=$1 to=$2
   rm -f $HOME$sub/lib/emacs/$to
   set -- $(echo $link | tr : ' ')
   from=$1 to=$2
   rm -f $HOME$sub/lib/emacs/$to

-  ln -s ../../$up$down/$from $HOME$sub/lib/emacs/$to
+  ln -s $here/$from $HOME$sub/lib/emacs/$to

 done
 $echon " compiling$echoc"
 make >/dev/null 2>&1 -C $HOME$sub/lib/emacs
 done
 $echon " compiling$echoc"
 make >/dev/null 2>&1 -C $HOME$sub/lib/emacs