X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/feff53b4914dbb8b4eca4d25e589933923c65622..a5abc1d29be727b2eb2159a614c9f12b5e2ea9d9:/setup

diff --git a/setup b/setup
index 79a6f34..7174162 100755
--- a/setup
+++ b/setup
@@ -130,7 +130,7 @@ fi
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el
-  vimrc mg
+  vimrc mg zile
   mailrc signature
   cgrc tigrc
   gdbinit
@@ -146,13 +146,12 @@ dotfiles="
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession Xdefaults vncrc vncsession
   fonts.conf
+  stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
-  e16-bindings:.e16/bindings.cfg
-  jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg
-  jue-peek.jpg:.e16/backgrounds/jue-peek.jpg"
+  e16-bindings:.e16/bindings.cfg"
 echo "Installing dotfiles..."
 for d in $dotfiles; do
   target=.$d
@@ -162,12 +161,34 @@ 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
 echo "	all done."
 
+## Symlink backgrounds.
+backgrounds="
+  jue-peek.jpg
+  medusa.jpg
+  rayne.jpg
+  hypatia.jpg
+  noodly.jpg"
+if [ "$xstuff" ]; then
+  echo "Installing backgrounds..."
+  for b in $backgrounds; do
+    for e in enlightenment e16; do
+      dir=$HOME$sub/.$e/backgrounds
+      t=$dir/$b
+      mkdir -p $dir
+      ln -s $here/bg/$b $t.new
+      mv $t.new $t
+    done
+    echo "  $b"
+  done
+  echo "	all done."
+fi
+
 ###--------------------------------------------------------------------------
 ### Process the Git configuration.
 
@@ -176,9 +197,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."
 
@@ -187,6 +208,7 @@ echo " done."
 
 scripts="
   mdw-editor
+  mdw-pager
   mdw-conf
   mdw-build
   movemail-hack
@@ -197,12 +219,13 @@ scripts="
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
+  un-backslashify-selection
   xshutdown"
 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
@@ -243,8 +266,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
@@ -260,11 +283,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