X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/499a48f31a6b81c695b7270fc474299c029669c1..ea8a749b5c5708d43158842ce93db909157ff391:/setup

diff --git a/setup b/setup
index 2eeb274..183ea64 100755
--- a/setup
+++ b/setup
@@ -75,47 +75,19 @@ done
 echo "	all done."
 
 ###--------------------------------------------------------------------------
-### Install necessary things.
-
-echo "Installing useful scripts..."
-
-scripts="
-  lesspipe.sh start-ssh-agent svnwrap"
-for script in $scripts; do
-  $echon "  $script:$echoc"
-  found=
-  for p in /bin /usr/bin /usr/local/bin $(echo $PATH | tr : ' '); do
-    if $false [ -x $p/$script ]; then
-      found=t
-      break
-    fi
-  done
-  if [ "$found" ]; then
-    echo " already installed."
-  else
-    $echon " downloading$echoc"
-    $GETURL $HOME$sub/bin/$script $REPO/$script
-    chmod +x $HOME$sub/bin/$script
-    echo " done."
-  fi
-done
-
-echo "	all done."
-
-###--------------------------------------------------------------------------
 ### Install some more complicated programs.
 
 echo "Installing packages..."
 systems="
-  mlib:2.0.4:crc-mktab
-  chkpath:1.1.0:tmpdir
+  mlib:crc-mktab
+  checkpath:tmpdir
 "
 [ "$xstuff" ] && systems="$systems
-  xtoys:1.4.0:xatom
+  xtoys:xatom
 "
 for system in $systems; do
   set -- $(echo $system | tr : ' ')
-  sys=$1 ver=$2 prog=$3
+  sys=$1 prog=$2
   $echon "  $sys:$echoc"
   if $false $prog >/dev/null 2>&1 --version; then
     echo " already installed."
@@ -123,12 +95,13 @@ for system in $systems; do
     ( set -e
       $echon " downloading$echoc"
       cd $HOME$sub/src
-      rm -rf $sys-$ver.tar.gz $sys-$ver
-      $GETURL $sys-$ver.tar.gz $REPO/$sys-$ver.tar.gz
+      rm -rf $sys.tar.gz $sys-$ver
+      $GETURL $sys.tar.gz $REPO/$sys.tar.gz
       $echon " unpacking$echoc"
-      gzip -cd $sys-$ver.tar.gz | tar xf -
+      dir=$(gzip -cd $sys.tar.gz | tar tf - | head -1)
+      gzip -cd $sys.tar.gz | tar xf -
       $echon " configuring$echoc"
-      cd $sys-$ver
+      cd $dir
       mkdir build
       cd build
       ../configure --prefix=$HOME$sub >>buildlog 2>&1
@@ -215,7 +188,11 @@ scripts="
   mdw-editor
   mdw-conf
   movemail-hack
-  emerge-hack"
+  emerge-hack
+  lesspipe.sh
+  start-ssh-agent
+  svnwrap
+  hyperspec"
 [ "$xstuff" ] && scripts="$scripts
   xrun
   xshutdown"
@@ -250,6 +227,7 @@ fi
 echo "Installing Emacs packages..."
 emacspkg="
   make-regexp
+  ew-hols
   git git-blame vc-git stgit
   quilt"
 for elib in $emacspkg; do