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

diff --git a/setup b/setup
index da1d071..37dc474 100755
--- a/setup
+++ b/setup
@@ -10,7 +10,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://ftp.distorted.org.uk/ftp/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
 
@@ -104,7 +104,10 @@ for system in $systems; do
       cd $dir
       mkdir build
       cd build
-      ../configure --prefix=$HOME$sub >>buildlog 2>&1
+      ../configure \
+	--prefix=$HOME$sub \
+	PKG_CONFIG_PATH=$HOME$sub/lib/pkgconfig \
+	>>buildlog 2>&1
       $echon " building$echoc"
       make >>buildlog 2>&1
       $echon " installing$echoc"
@@ -129,30 +132,39 @@ fi
 ## Symlink the various dotfiles into place
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
-  emacs emacs-calc vm gnus.el
-  vimrc mg zile
-  mailrc signature
+  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
   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
     lisp-init.lisp:.sbclrc
     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
+  mdw.session:.config/gnome-session/sessions/mdw.session
   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
-  jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg
-  jue-peek.jpg:.e16/backgrounds/jue-peek.jpg"
+  e16-bindings:.e16/bindings.cfg"
 echo "Installing dotfiles..."
 for d in $dotfiles; do
   target=.$d
@@ -162,58 +174,133 @@ for d in $dotfiles; do
   ft=$HOME$sub/$target
   dir=${ft%/*}
   mkdir -p $dir
-  ln -s $here/$d $ft.new
+  ln -s $here/dot/$d $ft.new
   mv $ft.new $ft
   echo "  $target"
 done
 echo "	all done."
 
-###--------------------------------------------------------------------------
-### Process the Git configuration.
+## 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
+  mykermrc
+  pulse-default.pa.in:.pulse/default.pa"
+echo "Installing dotfiles with substitutions..."
+for d in $dotfilessubst; do
+  case $d in
+    *:*) target=${d#*:} d=${d%%:*};;
+    *) target=.$d d=$d.in;;
+  esac
+  ft=$HOME$sub/$target
+  dir=${ft%/*}
+  mkdir -p $dir
+  sed "
+1i\\
+### generated by $here/setup; do not edit!\\
 
-echo -n "Installing Git configuration:"
-sed "
-1i\
-### generated by $here/setup; do not edit!\
+/@home@/ s$HOMEg
+/@profile@/ s$hereg
+/@releasekey@/ s$(bin/mdw-conf releasekey 481334C2)g
+" dot/$d >$ft.new
+  mv $ft.new $ft
+  echo "  $target"
+done
+echo "  all done."
 
-/@releasekey@/ s::$(./mdw-conf release-key 481334C2):g
-/@gitignore@/ s::$(./mdw-conf gitignore $here/gitignore):g
-" gitconfig >$HOME/.gitconfig.new
-mv $HOME/.gitconfig.new $HOME/.gitconfig
-echo " done."
+## Symlink backgrounds.
+backgrounds=$(cd bg && echo *)
+if [ "$xstuff" ]; then
+  echo "Installing backgrounds..."
+  for b in $backgrounds; do
+    for e in enlightenment e16; do
+      dir=$HOME$sub/.$e/backgrounds
+      t=$dir/$b
+      mkdir -p $dir
+      ln -s $here/bg/$b $t.new
+      mv $t.new $t
+    done
+    echo "  $b"
+  done
+  echo "	all done."
+fi
 
 ###--------------------------------------------------------------------------
 ### Install useful scripts included in this package.
 
 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
   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
 for s in $scripts; do
   ft=$HOME$sub/bin/$s
-  ln -s $here/$s $ft.new
+  ln -s $here/bin/$s $ft.new
   mv $ft.new $ft
   echo "  $s"
 done
 echo "	all done."
 
+hacks="
+  ssh:ssh"
+echo "Installing hacks..."
+for h in $hacks; do
+  d=${h%%:*} h=${h#*:}
+  ft=$HOME$sub/bin/hacks/$d
+  mkdir -p $ft
+  ln -s $here/hacks/$h $ft/$h.new
+  mv $ft/$h.new $ft/$h
+  echo "  $d:$h"
+done
+echo "	all done."
+
 ###--------------------------------------------------------------------------
 ### Set up the Emacs config.
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs22 emacs21 emacs; do
+for i in emacs23 emacs24 emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break
@@ -232,6 +319,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"
@@ -243,8 +331,8 @@ for elib in $emacspkg; do
 		       (error 1))))'; then
     echo " already installed."
   else
-    if [ -f $elib.el ]; then
-      cp $elib.el $HOME$sub/lib/emacs/$elib.el
+    if [ -f el/$elib.el ]; then
+      cp el/$elib.el $HOME$sub/lib/emacs/$elib.el
     else
       $echon " downloading$echoc"
       $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el
@@ -260,14 +348,13 @@ echo "	all done."
 
 $echon "Setting up Emacs configuration:$echoc"
 $echon " linking$echoc"
-for link in dot-emacs.el:dot-emacs.el emacs-Makefile:Makefile; do
+for f in dot-emacs.el Makefile; do
   set -- $(echo $link | tr : ' ')
-  from=$1 to=$2
-  ln -s $here/$from $HOME$sub/lib/emacs/$to.new
-  mv $HOME$sub/lib/emacs/$to.new $HOME$sub/lib/emacs/$to
+  ln -s $here/el/$f $HOME$sub/lib/emacs/$f.new
+  mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f
 done
 $echon " compiling$echoc"
-make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs
+{ cd $HOME$sub/lib/emacs && make EMACS=$emacs; } >/dev/null 2>&1
 echo " done."
 
 ###----- That's all, folks --------------------------------------------------