X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e517857ccb761df498445e0ea2ec9cf2b8c7b53f..0b496fcb9552eac2040f683e1dbb3145e7481bbd:/setup

diff --git a/setup b/setup
index 57f3b04..499841e 100755
--- a/setup
+++ b/setup
@@ -167,8 +167,41 @@ 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 medusa.jpg rayne.jpg"
+backgrounds="
+  jue-peek.jpg
+  medusa.jpg
+  bsg-supper.jpg
+  rayne.jpg
+  hypatia.jpg
+  noodly.jpg
+  lovelace.jpg"
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -185,20 +218,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="
@@ -206,7 +225,9 @@ scripts="
   mdw-pager
   mdw-conf
   mdw-build
+  emacsclient-hack
   movemail-hack
+  aspell-hack
   emerge-hack
   lesspipe.sh
   start-ssh-agent
@@ -215,6 +236,7 @@ scripts="
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
   un-backslashify-selection
+  lock-screen
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
@@ -231,7 +253,7 @@ echo "	all done."
 
 $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