X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c4e84cb158a656fffecd4b8db436d895b69412cf..98ed7cc2ba10a33b2ed9ff360579bb661d892660:/setup

diff --git a/setup b/setup
index e48ce2e..5081807 100755
--- a/setup
+++ b/setup
@@ -129,12 +129,14 @@ fi
 ## Symlink the various dotfiles into place
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
-  emacs emacs-calc vm gnus.el
+  emacs emacs-calc vm gnus.el ercrc.el
   vimrc mg zile
+  ditz-config
   mailrc signature
   cgrc tigrc
   gdbinit
   guile
+  rcrc
   toprc
   aspell.conf
   lisp-init.lisp:.cmucl-init.lisp
@@ -167,6 +169,32 @@ for d in $dotfiles; do
 done
 echo "	all done."
 
+## Substitute things which need substituting.
+dotfilessubst="
+  gitconfig
+  pulse-default.pa.in:.pulse/default.pa"
+echo "Installing dotfiles with substitutions..."
+for d in $dotfilessubst; do
+  case $d in
+    *:*) target=${d#*:} d=${d%%:*};;
+    *) target=.$d d=$d.in;;
+  esac
+  ft=$HOME$sub/$target
+  dir=${ft%/*}
+  mkdir -p $dir
+  sed "
+1i\
+### generated by $here/setup; do not edit!\
+
+/@home@/ s$HOMEg
+/@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
+/@gitignore@/ s$(bin/mdw-conf gitignore $here/git/gitignore)g
+" dot/$d >$ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+echo "  all done."
+
 ## Symlink backgrounds.
 backgrounds="
   jue-peek.jpg
@@ -174,7 +202,8 @@ backgrounds="
   bsg-supper.jpg
   rayne.jpg
   hypatia.jpg
-  noodly.jpg"
+  noodly.jpg
+  lovelace.jpg"
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -191,20 +220,6 @@ if [ "$xstuff" ]; then
 fi
 
 ###--------------------------------------------------------------------------
-### Process the Git configuration.
-
-echo -n "Installing Git configuration:"
-sed "
-1i\
-### generated by $here/setup; do not edit!\
-
-/@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."
-
-###--------------------------------------------------------------------------
 ### Install useful scripts included in this package.
 
 scripts="
@@ -214,6 +229,7 @@ scripts="
   mdw-build
   emacsclient-hack
   movemail-hack
+  aspell-hack
   emerge-hack
   lesspipe.sh
   start-ssh-agent
@@ -234,12 +250,25 @@ for s in $scripts; do
 done
 echo "	all done."
 
+hacks="
+  ssh:ssh"
+echo "Installing hacks..."
+for h in $hacks; do
+  d=${h%%:*} h=${h#*:}
+  ft=$HOME$sub/bin/hacks/$d
+  mkdir -p $ft
+  ln -s $here/hacks/$h $ft/$h.new
+  mv $ft/$h.new $ft/$h
+  echo "  $d:$h"
+done
+echo "	all done."
+
 ###--------------------------------------------------------------------------
 ### Set up the Emacs config.
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs21 emacs; do
+for i in emacs22 emacs23 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break