X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0633739bf572224d7d5948d40cb168fecde53d09..852cd5fbddafbfed93df4cda8ba366b14922e95d:/setup diff --git a/setup b/setup index 39456f6..ec629c4 100755 --- a/setup +++ b/setup @@ -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,18 +141,21 @@ else fi ### Symlink the various dotfiles into place -dotfiles=" - bash_profile bash_logout bashrc - emacs emacs-calc - vm mailrc +dotfiles=" + bash_profile bash_logout bashrc inputrc bash_completion + emacs emacs-calc + vm mailrc signature + gitconfig cgrc stgitrc 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 + xinitrc xsession Xdefaults vncrc vncsession eterm-theme.cfg:.Eterm/themes/Eterm/theme.cfg e-keybindings.cfg:.enlightenment/keybindings.cfg + evnc-keybindings.cfg:.enlightenment-vnc/keybindings.cfg jue-peek.jpg:.enlightenment/backgrounds/jue-peek.jpg" mkdir -p $HOME/test echo "Installing dotfiles..." @@ -168,7 +171,7 @@ for d in $dotfiles; do mv $ft.new $ft echo " $target" done -echo " all done." +echo " all done." ### Set up the Emacs config $echon "Finding a suitable emacs:$echoc" @@ -187,25 +190,30 @@ else fi echo "Installing Emacs packages..." -for elib in make-regexp; do +emacspkg=" + make-regexp + git vc-git + 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"