From: Mark Wooding Date: Sat, 18 Jul 2009 15:06:02 +0000 (+0100) Subject: Great reorganization. X-Git-Url: https://git.distorted.org.uk/~mdw/profile/commitdiff_plain/9906310798d936a6cacd0ec5a2d3b607e911c423 Great reorganization. Put the various files into subdirectories to make the project less cluttered. Maybe there'll be a Makefile some day. --- diff --git a/jue-peek.jpg b/bg/jue-peek.jpg similarity index 100% rename from jue-peek.jpg rename to bg/jue-peek.jpg diff --git a/medusa.jpg b/bg/medusa.jpg similarity index 100% rename from medusa.jpg rename to bg/medusa.jpg diff --git a/rayne.jpg b/bg/rayne.jpg similarity index 100% rename from rayne.jpg rename to bg/rayne.jpg diff --git a/emerge-hack b/bin/emerge-hack similarity index 100% rename from emerge-hack rename to bin/emerge-hack diff --git a/hyperspec b/bin/hyperspec similarity index 100% rename from hyperspec rename to bin/hyperspec diff --git a/lesspipe.sh b/bin/lesspipe.sh similarity index 100% rename from lesspipe.sh rename to bin/lesspipe.sh diff --git a/mdw-build b/bin/mdw-build similarity index 100% rename from mdw-build rename to bin/mdw-build diff --git a/mdw-conf b/bin/mdw-conf similarity index 100% rename from mdw-conf rename to bin/mdw-conf diff --git a/mdw-editor b/bin/mdw-editor similarity index 100% rename from mdw-editor rename to bin/mdw-editor diff --git a/mdw-pager b/bin/mdw-pager similarity index 100% rename from mdw-pager rename to bin/mdw-pager diff --git a/movemail-hack b/bin/movemail-hack similarity index 100% rename from movemail-hack rename to bin/movemail-hack diff --git a/start-ssh-agent b/bin/start-ssh-agent similarity index 100% rename from start-ssh-agent rename to bin/start-ssh-agent diff --git a/svnwrap b/bin/svnwrap similarity index 100% rename from svnwrap rename to bin/svnwrap diff --git a/un-backslashify-selection b/bin/un-backslashify-selection similarity index 100% rename from un-backslashify-selection rename to bin/un-backslashify-selection diff --git a/xinitcmd b/bin/xinitcmd similarity index 100% rename from xinitcmd rename to bin/xinitcmd diff --git a/xshutdown b/bin/xshutdown similarity index 100% rename from xshutdown rename to bin/xshutdown diff --git a/Xdefaults b/dot/Xdefaults similarity index 100% rename from Xdefaults rename to dot/Xdefaults diff --git a/aspell.conf b/dot/aspell.conf similarity index 100% rename from aspell.conf rename to dot/aspell.conf diff --git a/bash_completion b/dot/bash_completion similarity index 100% rename from bash_completion rename to dot/bash_completion diff --git a/bash_logout b/dot/bash_logout similarity index 100% rename from bash_logout rename to dot/bash_logout diff --git a/bash_profile b/dot/bash_profile similarity index 100% rename from bash_profile rename to dot/bash_profile diff --git a/bashrc b/dot/bashrc similarity index 100% rename from bashrc rename to dot/bashrc diff --git a/cgrc b/dot/cgrc similarity index 100% rename from cgrc rename to dot/cgrc diff --git a/colordiffrc b/dot/colordiffrc similarity index 100% rename from colordiffrc rename to dot/colordiffrc diff --git a/cvsrc b/dot/cvsrc similarity index 100% rename from cvsrc rename to dot/cvsrc diff --git a/dircolors b/dot/dircolors similarity index 100% rename from dircolors rename to dot/dircolors diff --git a/e-keybindings.cfg b/dot/e-keybindings.cfg similarity index 100% rename from e-keybindings.cfg rename to dot/e-keybindings.cfg diff --git a/e16-bindings b/dot/e16-bindings similarity index 100% rename from e16-bindings rename to dot/e16-bindings diff --git a/emacs b/dot/emacs similarity index 100% rename from emacs rename to dot/emacs diff --git a/emacs-calc b/dot/emacs-calc similarity index 100% rename from emacs-calc rename to dot/emacs-calc diff --git a/eterm-theme.cfg b/dot/eterm-theme.cfg similarity index 100% rename from eterm-theme.cfg rename to dot/eterm-theme.cfg diff --git a/evnc-keybindings.cfg b/dot/evnc-keybindings.cfg similarity index 100% rename from evnc-keybindings.cfg rename to dot/evnc-keybindings.cfg diff --git a/fonts.conf b/dot/fonts.conf similarity index 100% rename from fonts.conf rename to dot/fonts.conf diff --git a/gdbinit b/dot/gdbinit similarity index 100% rename from gdbinit rename to dot/gdbinit diff --git a/gnus.el b/dot/gnus.el similarity index 100% rename from gnus.el rename to dot/gnus.el diff --git a/guile b/dot/guile similarity index 100% rename from guile rename to dot/guile diff --git a/indent.pro b/dot/indent.pro similarity index 100% rename from indent.pro rename to dot/indent.pro diff --git a/inputrc b/dot/inputrc similarity index 100% rename from inputrc rename to dot/inputrc diff --git a/lisp-init.lisp b/dot/lisp-init.lisp similarity index 100% rename from lisp-init.lisp rename to dot/lisp-init.lisp diff --git a/mailrc b/dot/mailrc similarity index 100% rename from mailrc rename to dot/mailrc diff --git a/mg b/dot/mg similarity index 100% rename from mg rename to dot/mg diff --git a/putty-defaults b/dot/putty-defaults similarity index 100% rename from putty-defaults rename to dot/putty-defaults diff --git a/screenrc b/dot/screenrc similarity index 100% rename from screenrc rename to dot/screenrc diff --git a/signature b/dot/signature similarity index 100% rename from signature rename to dot/signature diff --git a/swank.lisp b/dot/swank.lisp similarity index 100% rename from swank.lisp rename to dot/swank.lisp diff --git a/tigrc b/dot/tigrc similarity index 100% rename from tigrc rename to dot/tigrc diff --git a/toprc b/dot/toprc similarity index 100% rename from toprc rename to dot/toprc diff --git a/vimrc b/dot/vimrc similarity index 100% rename from vimrc rename to dot/vimrc diff --git a/vm b/dot/vm similarity index 100% rename from vm rename to dot/vm diff --git a/vncrc b/dot/vncrc similarity index 100% rename from vncrc rename to dot/vncrc diff --git a/vncsession b/dot/vncsession similarity index 100% rename from vncsession rename to dot/vncsession diff --git a/xinitrc b/dot/xinitrc similarity index 100% rename from xinitrc rename to dot/xinitrc diff --git a/xsession b/dot/xsession similarity index 100% rename from xsession rename to dot/xsession diff --git a/zile b/dot/zile similarity index 100% rename from zile rename to dot/zile diff --git a/emacs-Makefile b/el/Makefile similarity index 100% rename from emacs-Makefile rename to el/Makefile diff --git a/dot-emacs.el b/el/dot-emacs.el similarity index 100% rename from dot-emacs.el rename to el/dot-emacs.el diff --git a/mdw-gnus-patch.el b/el/mdw-gnus-patch.el similarity index 100% rename from mdw-gnus-patch.el rename to el/mdw-gnus-patch.el diff --git a/gitconfig b/git/gitconfig similarity index 100% rename from gitconfig rename to git/gitconfig diff --git a/gitignore b/git/gitignore similarity index 100% rename from gitignore rename to git/gitignore diff --git a/setup b/setup index 93ff48e..5c45d83 100755 --- a/setup +++ b/setup @@ -160,7 +160,7 @@ for d in $dotfiles; do ft=$HOME$sub/$target dir=${ft%/*} mkdir -p $dir - ln -s $here/$d $ft.new + ln -s $here/dot/$d $ft.new mv $ft.new $ft echo " $target" done @@ -175,7 +175,7 @@ if [ "$xstuff" ]; then dir=$HOME$sub/.$e/backgrounds t=$dir/$b mkdir -p $dir - ln -s $here/$b $t.new + ln -s $here/bg/$b $t.new mv $t.new $t done echo " $b" @@ -191,9 +191,9 @@ 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 +/@releasekey@/ s::$(bin/mdw-conf release-key 481334C2):g +/@gitignore@/ s::$(bin/mdw-conf gitignore $here/git/gitignore):g +" git/gitconfig >$HOME/.gitconfig.new mv $HOME/.gitconfig.new $HOME/.gitconfig echo " done." @@ -219,7 +219,7 @@ echo "Installing scripts..." mkdir -p $HOME$sub/bin for s in $scripts; do ft=$HOME$sub/bin/$s - ln -s $here/$s $ft.new + ln -s $here/bin/$s $ft.new mv $ft.new $ft echo " $s" done @@ -260,8 +260,8 @@ for elib in $emacspkg; do (error 1))))'; then echo " already installed." else - if [ -f $elib.el ]; then - cp $elib.el $HOME$sub/lib/emacs/$elib.el + if [ -f el/$elib.el ]; then + cp el/$elib.el $HOME$sub/lib/emacs/$elib.el else $echon " downloading$echoc" $GETURL $HOME$sub/lib/emacs/$elib.el $REPO/$elib.el @@ -277,11 +277,10 @@ echo " all done." $echon "Setting up Emacs configuration:$echoc" $echon " linking$echoc" -for link in dot-emacs.el:dot-emacs.el emacs-Makefile:Makefile; do +for f in dot-emacs.el Makefile; do set -- $(echo $link | tr : ' ') - from=$1 to=$2 - ln -s $here/$from $HOME$sub/lib/emacs/$to.new - mv $HOME$sub/lib/emacs/$to.new $HOME$sub/lib/emacs/$to + ln -s $here/el/$f $HOME$sub/lib/emacs/$f.new + mv $HOME$sub/lib/emacs/$f.new $HOME$sub/lib/emacs/$f done $echon " compiling$echoc" make >/dev/null 2>&1 -C $HOME$sub/lib/emacs EMACS=$emacs