X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/917b7a9ad964050b20dc4474c802e27e31c8a28d..9b72460cefa01e43c6a5891704a9498fdda8ea16:/setup diff --git a/setup b/setup index a55fb16..4ff3c75 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} +: ${REPO=http://guvnor.distorted.org.uk/ftp/pub/mdw/profile} export PATH=/usr/local/bin:$HOME$sub/bin:/usr/bin:/usr/ccs/bin:/bin @@ -67,7 +67,11 @@ fi ### Install necessary things echo "Installing useful scripts..." -for script in lesspipe.sh start-ssh-agent svnwrap; do +scripts=" + lesspipe.sh start-ssh-agent svnwrap" +[ "$xstuff" ] && scripts="$scripts + xrun" +for script in $scripts; do $echon " $script:$echoc" found= for p in /bin /usr/bin /usr/local/bin $(echo $PATH | tr : ' '); do @@ -140,15 +144,16 @@ fi dotfiles=" bash_profile bash_logout bashrc inputrc emacs emacs-calc - vm mailrc + vm mailrc signature lisp-init.lisp:.cmucl-init.lisp lisp-init.lisp:.sbclrc lisp-init.lisp:.clisprc.lisp dircolors screenrc cvsrc" [ "$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..." @@ -183,21 +188,26 @@ 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