X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f7cb5c8483a2a251b6cc0f968a179ed76f0f883f..722f9bbc19c29890c84acfca39ef02017847c292:/setup

diff --git a/setup b/setup
index 2b2ead2..c4eb953 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,8 +152,9 @@ 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 vncrc vncsession
   fonts.conf
@@ -190,7 +193,7 @@ for c in $cppfiles; do
   ft=$HOME$sub/$target
   dir=${ft%/*}
   mkdir -p $dir
-  cpp dot/$c -o $ft.new
+  cpp -P dot/$c -o $ft.new
   mv $ft.new $ft
   echo "  $target"
 done
@@ -257,7 +260,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
@@ -304,7 +308,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