X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c39d1139c4dc74bae2bdb809799efcfe8306ddca..3c40e4528968844b262be2a212b23205c0646e26:/setup

diff --git a/setup b/setup
index c90e390..6504cbb 100755
--- a/setup
+++ b/setup
@@ -133,15 +133,16 @@ fi
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile
+  vimrc mg zile lesskey
   ditz-config
-  mailrc signature
+  mailrc signature muttrc
   cgrc tigrc
   gdbinit
   guile
   rcrc
   toprc
   mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
+  pulse-daemon.conf:.pulse/daemon.conf
   aspell.conf
   tclshrc:.tclshrc tclshrc:.wishrc
   lisp-init.lisp:.cmucl-init.lisp
@@ -149,9 +150,10 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -175,9 +177,29 @@ for d in $dotfiles; do
 done
 echo "	all done."
 
+## CPP-hack files which need it.
+cppfiles=""
+[ "$xstuff" ] && cppfiles="$cppfiles
+  Xdefaults"
+echo "Hacking files with C preprocessor..."
+for c in $cppfiles; do
+  target=.$c
+  case $c in
+    *:*) target=${c#*:} c=${c%%:*};;
+  esac
+  ft=$HOME$sub/$target
+  dir=${ft%/*}
+  mkdir -p $dir
+  cpp -P dot/$c -o $ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+echo "	all done."
+
 ## Substitute things which need substituting.
 dotfilessubst="
   gitconfig
+  mykermrc
   pulse-default.pa.in:.pulse/default.pa"
 echo "Installing dotfiles with substitutions..."
 for d in $dotfilessubst; do
@@ -194,7 +216,7 @@ for d in $dotfilessubst; do
 
 /@home@/ s$HOMEg
 /@profile@/ s$hereg
-/@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
+/@releasekey@/ s$(bin/mdw-conf releasekey 481334C2)g
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
@@ -203,13 +225,16 @@ echo "  all done."
 
 ## Symlink backgrounds.
 backgrounds="
-  jue-peek.jpg
-  medusa.jpg
   bsg-supper.jpg
-  rayne.jpg
+  harley-quinn.jpg
   hypatia.jpg
+  jue-peek.jpg
+  lilith.jpg
+  lovelace.jpg
+  medusa.jpg
   noodly.jpg
-  lovelace.jpg"
+  rayne.jpg
+"
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -239,13 +264,17 @@ scripts="
   aspell-hack
   emerge-hack
   lesspipe.sh
+  run-with-shell-env
   start-ssh-agent
+  start-ssh-pageant
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
   un-backslashify-selection
   lock-screen
+  xpra-start-xdummy
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
@@ -294,6 +323,7 @@ emacspkg="
   ew-hols
   mdw-gnus-patch
   git git-blame vc-git stgit
+  mdw-multiple-cursors
   quilt"
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"