Great reorganization.

[profile] / setup

diff --git a/setup b/setup
index 93ff48e15242367c9517be47407667479bf3e174..5c45d83ea28da8a3988257cf867d82ba99a39ca0 100755 (executable)
--- a/setup
+++ b/setup
@@ -160,7 +160,7 @@ for d in $dotfiles; do
   ft=$HOME$sub/$target
   dir=${ft%/*}
   mkdir -p $dir
-  ln -s $here/$d $ft.new
+  ln -s $here/dot/$d $ft.new
   mv $ft.new $ft
   echo "  $target"
 done
@@ -175,7 +175,7 @@ if [ "$xstuff" ]; then
       dir=$HOME$sub/.$e/backgrounds
       t=$dir/$b
       mkdir -p $dir
-      ln -s $here/$b $t.new
+      ln -s $here/bg/$b $t.new
       mv $t.new $t
     done
     echo "  $b"
@@ -191,9 +191,9 @@ sed "
 1i\
 ### generated by $here/setup; do not edit!\
 
-/@releasekey@/ s::$(./mdw-conf release-key 481334C2):g
-/@gitignore@/ s::$(./mdw-conf gitignore $here/gitignore):g
-" gitconfig >$HOME/.gitconfig.new
+/@releasekey@/ s::$(bin/mdw-conf release-key 481334C2):g
+/@gitignore@/ s::$(bin/mdw-conf gitignore $here/git/gitignore):g
+" git/gitconfig >$HOME/.gitconfig.new
 mv $HOME/.gitconfig.new $HOME/.gitconfig
 echo " done."
 
@@ -219,7 +219,7 @@ echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
 for s in $scripts; do
   ft=$HOME$sub/bin/$s
-  ln -s $here/$s $ft.new
+  ln -s $here/bin/$s $ft.new
   mv $ft.new $ft
   echo "  $s"
 done
@@ -260,8 +260,8 @@ for elib in $emacspkg; do
                       (error 1))))'; then
     echo " already installed."
   else
-    if [ -f $elib.el ]; then
-      cp $elib.el $HOME$sub/lib/emacs/$elib.el
+    if [ -f el/$elib.el ]; then
+      cp el/$elib.el $HOME$sub/lib/emacs/$elib.el
     else
       $echon " downloading$echoc"
       $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el
@@ -277,11 +277,10 @@ echo "    all done."
 
 $echon "Setting up Emacs configuration:$echoc"
 $echon " linking$echoc"
-for link in dot-emacs.el:dot-emacs.el emacs-Makefile:Makefile; do
+for f in dot-emacs.el Makefile; do
   set -- $(echo $link | tr : ' ')
-  from=$1 to=$2
-  ln -s $here/$from $HOME$sub/lib/emacs/$to.new
-  mv $HOME$sub/lib/emacs/$to.new $HOME$sub/lib/emacs/$to
+  ln -s $here/el/$f $HOME$sub/lib/emacs/$f.new
+  mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f
 done
 $echon " compiling$echoc"
 make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs