X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e1ca556ba315b34e833aa4338a988f73a85f9566..2c49e0816cc0cbf93d5763f962cc46f07eb70ffb:/setup

diff --git a/setup b/setup
index 0bd95f6..5242bd8 100755
--- a/setup
+++ b/setup
@@ -135,6 +135,7 @@ dotfiles="
   cgrc tigrc
   gdbinit
   guile
+  rcrc
   toprc
   aspell.conf
   lisp-init.lisp:.cmucl-init.lisp
@@ -167,6 +168,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
@@ -192,20 +219,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="
@@ -213,7 +226,9 @@ scripts="
   mdw-pager
   mdw-conf
   mdw-build
+  emacsclient-hack
   movemail-hack
+  aspell-hack
   emerge-hack
   lesspipe.sh
   start-ssh-agent
@@ -239,7 +254,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