X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c39d1139c4dc74bae2bdb809799efcfe8306ddca..ecde2a36fd2952a2c7943b784f09ed339b4e6ff4:/setup

diff --git a/setup b/setup
index c90e390..f7a0d9e 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
 
@@ -131,17 +131,25 @@ fi
 
 ## Symlink the various dotfiles into place
 dotfiles="
-  bash_profile bash_logout bashrc inputrc bash_completion
+  profile shell-rc shell-logout
+  bash-profile:.bash_profile
+  bash-completion:.bash_completion bashrc inputrc
+  shrc
+  zprofile zshrc zshenv
   emacs emacs-calc vm gnus.el ercrc.el
-  vimrc mg zile
+  vimrc mg zile lesskey infokey sqliterc
+  parallel-config:.parallel/config
+  ipython-config.py:.ipython/profile_default/ipython_config.py
+  ipython-key-bindings.py:.ipython/profile_default/startup/50-key-bindings.py
   ditz-config
-  mailrc signature
+  mailrc signature muttrc
   cgrc tigrc
   gdbinit
   guile
   rcrc
   toprc
   mc-ini:.mc/ini mc-panels.ini:.mc/panels.ini
+  pulse-daemon.conf:.pulse/daemon.conf
   aspell.conf
   tclshrc:.tclshrc tclshrc:.wishrc
   lisp-init.lisp:.cmucl-init.lisp
@@ -149,9 +157,11 @@ dotfiles="
     lisp-init.lisp:.clisprc.lisp
     lisp-init.lisp:.eclrc
   swank.lisp
-  dircolors colordiffrc screenrc cvsrc indent.pro"
+  mdw-build.conf:.config/mdw-build.conf
+  w3m-config:.w3m/config elinks.conf:.elinks/elinks.conf
+  dircolors colordiffrc screenrc tmux.conf cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults vncrc vncsession
+  xinitrc xsession xmodmap vncrc vncsession
   fonts.conf
   stalonetrayrc
   putty-defaults:.putty/sessions/Default%20Settings
@@ -159,7 +169,10 @@ dotfiles="
   eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
   e-keybindings.cfg:.enlightenment/keybindings.cfg
   evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
-  e16-bindings:.e16/bindings.cfg"
+  e16-bindings:.e16/bindings.cfg
+  gtkrc-2.0
+  gtk3.css:.config/gtk-3.0/gtk.css
+  gtk3-settings.ini:.config/gtk-3.0/settings.ini"
 echo "Installing dotfiles..."
 for d in $dotfiles; do
   target=.$d
@@ -175,9 +188,31 @@ 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=$(bin/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
+  mykermrc
   pulse-default.pa.in:.pulse/default.pa"
 echo "Installing dotfiles with substitutions..."
 for d in $dotfilessubst; do
@@ -194,7 +229,7 @@ for d in $dotfilessubst; do
 
 /@home@/ s$HOMEg
 /@profile@/ s$hereg
-/@releasekey@/ s$(bin/mdw-conf release-key 481334C2)g
+/@releasekey@/ s$(bin/mdw-conf releasekey 481334C2)g
 " dot/$d >$ft.new
   mv $ft.new $ft
   echo "  $target"
@@ -202,14 +237,7 @@ done
 echo "  all done."
 
 ## Symlink backgrounds.
-backgrounds="
-  jue-peek.jpg
-  medusa.jpg
-  bsg-supper.jpg
-  rayne.jpg
-  hypatia.jpg
-  noodly.jpg
-  lovelace.jpg"
+backgrounds=$(cd bg && echo *)
 if [ "$xstuff" ]; then
   echo "Installing backgrounds..."
   for b in $backgrounds; do
@@ -232,20 +260,26 @@ 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
   aspell-hack
   emerge-hack
   lesspipe.sh
+  run-with-shell-env
   start-ssh-agent
+  start-ssh-pageant
+  add-ssh-keys
   svnwrap
+  guest-console
   hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xinitcmd
   un-backslashify-selection
   lock-screen
+  xpra-start-xdummy
   xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
@@ -275,7 +309,7 @@ echo "	all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs23 emacs21 emacs; do
+for i in emacs24 emacs23 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break
@@ -294,6 +328,7 @@ emacspkg="
   ew-hols
   mdw-gnus-patch
   git git-blame vc-git stgit
+  mdw-multiple-cursors
   quilt"
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"