X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/4d60a7ac95f814edd26bc558b486968a5a0728a0..a52bc3ca530361debf4825965ed426b55a8599f6:/setup

diff --git a/setup b/setup
index 50964ae..057a1ba 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
 
@@ -135,6 +135,7 @@ dotfiles="
   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
@@ -184,6 +185,8 @@ 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
@@ -192,7 +195,7 @@ for c in $cppfiles; do
   ft=$HOME$sub/$target
   dir=${ft%/*}
   mkdir -p $dir
-  cpp -P dot/$c -o $ft.new
+  cpp -P $defs dot/$c -o $ft.new
   mv $ft.new $ft
   echo "  $target"
 done
@@ -307,7 +310,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