X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/400223a1ae71e4df036ca2734c01f8214a070c8a..b1d0353df9607ce4fceb387a0d7b123eb397e6f2:/setup

diff --git a/setup b/setup
index b9adf91..16ad5fb 100755
--- a/setup
+++ b/setup
@@ -7,7 +7,7 @@ umask 002
 sub=
 mkdir -p $HOME$sub
 
-: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw/profile}
+: ${REPO=http://ftp.distorted.org.uk/ftp/pub/mdw/profile}
 
 export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin
 
@@ -48,7 +48,7 @@ for i in bin lib/emacs src; do
     echo " done."
   fi
 done
-echo "  all done."
+echo "	all done."
 
 ### Find out how to fetch things over the net
 $echon "Finding URL fetcher:$echoc"
@@ -68,7 +68,7 @@ fi
 echo "Installing useful scripts..."
 
 scripts="
-  lesspipe.sh start-ssh-agent svnwrap"
+  lesspipe.sh start-ssh-agent svnwrap movemail-hack"
 [ "$xstuff" ] && scripts="$scripts
   xrun"
 for script in $scripts; do
@@ -90,7 +90,7 @@ for script in $scripts; do
   fi
 done
 
-echo "  all done."
+echo "	all done."
 
 ### Install some more complicated programs
 echo "Installing packages..."
@@ -129,7 +129,7 @@ for system in $systems; do
     )
   fi
 done
-echo "  all done."
+echo "	all done."
 
 ### Install global configuration
 echo -n "Installing dotfile configuration:"
@@ -141,20 +141,26 @@ else
 fi
 
 ### Symlink the various dotfiles into place
-dotfiles=" 
-  bash_profile bash_logout bashrc inputrc
-  emacs emacs-calc 
-  vm mailrc signature
+dotfiles="
+  bash_profile bash_logout bashrc inputrc bash_completion
+  emacs emacs-calc vm
+  vimrc mg
+  mailrc signature
+  gitconfig cgrc tigrc
   lisp-init.lisp:.cmucl-init.lisp
     lisp-init.lisp:.sbclrc
     lisp-init.lisp:.clisprc.lisp
-  dircolors screenrc cvsrc"
+    lisp-init.lisp:.eclrc
+  dircolors colordiffrc screenrc cvsrc indent.pro"
 [ "$xstuff" ] && dotfiles="$dotfiles
-  xinitrc xsession Xdefaults
-  eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg
+  xinitrc xsession Xdefaults vncrc vncsession
+  putty-defaults:.putty/sessions/Default%20Settings
   e-keybindings.cfg:.enlightenment/keybindings.cfg
-  jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg"
-mkdir -p $HOME/test
+  evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg
+  e16-bindings:.e16/bindings.cfg
+  e16-config:.e16/e_config--1.0.cfg
+  jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg
+  jue-peek.jpg:.e16/backgrounds/jue-peek.jpg"
 echo "Installing dotfiles..."
 for d in $dotfiles; do
   target=.$d
@@ -168,7 +174,20 @@ for d in $dotfiles; do
   mv $ft.new $ft
   echo "  $target"
 done
-echo "  all done."
+echo "	all done."
+
+### Install useful scripts included in this package
+scripts="
+  mdw-editor"
+echo "Installing scripts..."
+mkdir -p $HOME$sub/bin
+for s in $scripts; do
+  ft=$HOME$sub/bin/$s
+  ln -s $here/$s $ft.new
+  mv $ft.new $ft
+  echo "  $s"
+done
+echo "	all done."
 
 ### Set up the Emacs config
 $echon "Finding a suitable emacs:$echoc"
@@ -189,27 +208,28 @@ fi
 echo "Installing Emacs packages..."
 emacspkg="
   make-regexp
-  git vc-git
+  git git-blame vc-git stgit
   quilt"
 for elib in $emacspkg; do
   $echon "  $elib:$echoc"
   if $false $emacs >/dev/null 2>&1 --no-site-file --batch --eval '
-       (setq load-path (nconc load-path (list "~/lib/emacs")))
-       (kill-emacs (condition-case nil
-		       (progn (load-library "make-regexp") 0)
-		     (error 1)))'; then
+       (progn
+	 (setq load-path (nconc load-path (list "~/lib/emacs")))
+	 (kill-emacs (condition-case nil
+			 (progn (load-library "'"$elib"'") 0)
+		       (error 1))))'; then
     echo " already installed."
   else
     $echon " downloading$echoc"
-    $GETURL $HOME$sub/lib/emacs/make-regexp.el $REPO/make-regexp.el
+    $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el
     $echon " compiling$echoc"
     (cd $HOME$sub/lib/emacs;
       $emacs >/dev/null 2>&1 --no-site-file --batch \
-	--eval '(byte-compile-file "make-regexp.el")')
+	--eval '(byte-compile-file "'"$elib.el"'")')
     echo " done."
   fi
 done
-echo "  all done."
+echo "	all done."
 
 $echon "Setting up Emacs configuration:$echoc"
 $echon " linking$echoc"