X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/b7743290c8e149a23fa1390c11244ec3e365b4b8..a62d05415841b7ba66ba9a660f68b452c4f1d1b6:/setup

diff --git a/setup b/setup
index 2d5a0d0..37dc474 100755
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/pub/mdw/profile}
+: ${REPO=https://ftp.distorted.org.uk/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
@@ -134,6 +134,8 @@ dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm gnus.el ercrc.el
   vimrc mg zile lesskey
+  parallel-config:.parallel/config
+  ipython_config.py:.ipython/profile_default/ipython_config.py
   ditz-config
   mailrc signature muttrc
   cgrc tigrc
@@ -150,10 +152,11 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
+  mdw-build.conf:.config/mdw-build.conf
   w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
-  dircolors colordiffrc screenrc cvsrc indent.pro"
+  dircolors colordiffrc screenrc tmux.conf 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 +180,27 @@ 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..."
+defs="-DHOME=$HOME -DPROFILE=$here"
+defs="$defs -DEMACSWD=$(mdw-conf emacs-width 77)"
+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 $defs dot/$c -o $ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+echo "	all done."
+
 ## Substitute things which need substituting.
 dotfilessubst="
   gitconfig
@@ -205,17 +229,7 @@ done
 echo "  all done."
 
 ## Symlink backgrounds.
-backgrounds="
-  bsg-supper.jpg
-  harley-quinn.jpg
-  hypatia.jpg
-  jue-peek.jpg
-  lilith.jpg
-  lovelace.jpg
-  medusa.jpg
-  noodly.jpg
-  rayne.jpg
-"
+backgrounds=$(cd bg && echo *)
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -238,7 +252,8 @@ scripts="
   mdw-editor
   mdw-pager
   mdw-conf
-  mdw-build
+  mdw-build mdw-sbuild mdw-sbuild-server
+  update-buildable-branch
   emacsclient-hack
   movemail-hack
   sendmail-hack
@@ -285,7 +300,7 @@ echo "	all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs23 emacs21 emacs; do
+for i in emacs23 emacs24 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break