X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/eebca0926da491618068d698133bb03cab387a3b..6006518e876259e718e5bffc4e45a24b8a09d88e:/setup

diff --git a/setup b/setup
index 16ad5fb..856c50b 100755
--- a/setup
+++ b/setup
@@ -2,6 +2,9 @@
 
 set -e
 
+###--------------------------------------------------------------------------
+### Basic setup.
+
 umask 002
 
 sub=
@@ -11,7 +14,9 @@ mkdir -p $HOME$sub
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
-### Sort out command line
+###--------------------------------------------------------------------------
+### Sort out command line.
+
 xstuff= false=
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -24,10 +29,13 @@ while [ $# -gt 0 ]; do
   shift
 done
 
-### Find out where I am
+###--------------------------------------------------------------------------
+### Environment autoconfiguration.
+
+## Find out where I am
 here=$(pwd)
 
-### Suss out how to print things
+## Suss out how to print things
 out=$(echo -n "foo"; echo "bar")
 if [ "$out" = "foobar" ]; then
   echon="echo -n"
@@ -37,20 +45,7 @@ else
   echoc='\c'
 fi
 
-### Create the necessary directories
-echo "Creating directories..."
-for i in bin lib/emacs src; do
-  $echon "  $i:$echoc"
-  if [ -d $HOME$sub/$i ]; then
-    echo " already exists."
-  else
-    mkdir -p $HOME$sub/$i
-    echo " done."
-  fi
-done
-echo "	all done."
-
-### Find out how to fetch things over the net
+## Find out how to fetch things over the net
 $echon "Finding URL fetcher:$echoc"
 if curl >/dev/null 2>&1 --version || [ $? -eq 2 ]; then
   GETURL="curl -fs -o"
@@ -64,13 +59,28 @@ else
   exit 1
 fi
 
-### Install necessary things
+###--------------------------------------------------------------------------
+### Create the necessary directories.
+
+echo "Creating directories..."
+for i in bin lib/emacs src; do
+  $echon "  $i:$echoc"
+  if [ -d $HOME$sub/$i ]; then
+    echo " already exists."
+  else
+    mkdir -p $HOME$sub/$i
+    echo " done."
+  fi
+done
+echo "	all done."
+
+###--------------------------------------------------------------------------
+### Install necessary things.
+
 echo "Installing useful scripts..."
 
 scripts="
-  lesspipe.sh start-ssh-agent svnwrap movemail-hack"
-[ "$xstuff" ] && scripts="$scripts
-  xrun"
+  lesspipe.sh start-ssh-agent svnwrap"
 for script in $scripts; do
   $echon "  $script:$echoc"
   found=
@@ -92,15 +102,16 @@ done
 
 echo "	all done."
 
-### Install some more complicated programs
+###--------------------------------------------------------------------------
+### Install some more complicated programs.
+
 echo "Installing packages..."
 systems="
-  mLib:2.0.3:mLib-config
+  mlib:2.0.4:crc-mktab
   chkpath:1.1.0:tmpdir
 "
 [ "$xstuff" ] && systems="$systems
-  mgLib:1.1.0:mgLib-config
-  xtoys:1.3.0:xscsize
+  xtoys:1.4.0:xatom
 "
 for system in $systems; do
   set -- $(echo $system | tr : ' ')
@@ -131,7 +142,9 @@ for system in $systems; do
 done
 echo "	all done."
 
-### Install global configuration
+###--------------------------------------------------------------------------
+### Install global configuration.
+
 echo -n "Installing dotfile configuration:"
 if [ -f $HOME$sub/.mdw.conf ]; then
   echo " already installed."
@@ -140,13 +153,16 @@ else
   echo " done."
 fi
 
-### Symlink the various dotfiles into place
+## Symlink the various dotfiles into place
 dotfiles="
   bash_profile bash_logout bashrc inputrc bash_completion
   emacs emacs-calc vm
   vimrc mg
   mailrc signature
-  gitconfig cgrc tigrc
+  cgrc tigrc
+  gdbinit
+  guile
+  aspell.conf
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
@@ -155,6 +171,7 @@ dotfiles="
 [ "$xstuff" ] && dotfiles="$dotfiles
   xinitrc xsession Xdefaults vncrc vncsession
   putty-defaults:.putty/sessions/Default%20Settings
+  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
@@ -176,9 +193,31 @@ for d in $dotfiles; do
 done
 echo "	all done."
 
-### Install useful scripts included in this package
+###--------------------------------------------------------------------------
+### Process the Git configuration.
+
+echo -n "Installing Git configuration:"
+sed "
+1i\
+### generated by $here/setup; do not edit!\
+
+/@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."
+
+###--------------------------------------------------------------------------
+### Install useful scripts included in this package.
+
 scripts="
-  mdw-editor"
+  mdw-editor
+  mdw-conf
+  movemail-hack
+  emerge-hack"
+[ "$xstuff" ] && scripts="$scripts
+  xrun
+  xshutdown"
 echo "Installing scripts..."
 mkdir -p $HOME$sub/bin
 for s in $scripts; do
@@ -189,10 +228,12 @@ for s in $scripts; do
 done
 echo "	all done."
 
-### Set up the Emacs config
+###--------------------------------------------------------------------------
+### Set up the Emacs config.
+
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
-for i in emacs21 emacs; do
+for i in emacs22 emacs21 emacs; do
   if type -p >/dev/null $i; then
     emacs=$i
     break
@@ -242,3 +283,5 @@ done
 $echon " compiling$echoc"
 make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs
 echo " done."
+
+###----- That's all, folks --------------------------------------------------