From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 12 Apr 2010 18:32:29 +0000 (+0100)
Subject: Merge remote branch 'ponder'
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/3e0bbf902b9e91e6bbea4774672c8a1ac0835fe0?ds=inline;hp=-c

Merge remote branch 'ponder'

* ponder:
  setup, pulseaudio, git: Add PulseAudio configuration; substituted dotfiles.
---

3e0bbf902b9e91e6bbea4774672c8a1ac0835fe0
diff --combined setup
index abf2e24,94dc65d..499841e
--- a/setup
+++ b/setup
@@@ -167,6 -167,32 +167,32 @@@ for d in $dotfiles; d
  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
@@@ -191,20 -217,6 +217,6 @@@ if [ "$xstuff" ]; the
    echo "	all done."
  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.
  
@@@ -215,7 -227,6 +227,7 @@@ scripts=
    mdw-build
    emacsclient-hack
    movemail-hack
 +  aspell-hack
    emerge-hack
    lesspipe.sh
    start-ssh-agent