Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile

[profile] / setup

diff --git a/setup b/setup
index 6347acd..004b9fd 100755 (executable)
--- a/setup
+++ b/setup
@@ -153,7 +153,7 @@ dotfiles="
   w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
   dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession xmodmap Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -177,6 +177,25 @@ 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
@@ -239,6 +258,7 @@ scripts="
   mdw-pager
   mdw-conf
   mdw-build
+  update-buildable-branch
   emacsclient-hack
   movemail-hack
   sendmail-hack
@@ -255,6 +275,7 @@ scripts="
   xinitcmd
   un-backslashify-selection
   lock-screen
+  xpra-start-xdummy
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin