X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=new_home_directory;h=57e71882b52638caa2bb7d460e459a85330704fa;hb=545019c05c8bc7e417b78396d1aa44b49781e9e0;hp=31f0983266b98699a9fc20584e67bae2c3adfe65;hpb=09f790cb2bce7d239eee44597b2e80cbda525eff;p=bin.git diff --git a/new_home_directory b/new_home_directory index 31f0983..57e7188 100755 --- a/new_home_directory +++ b/new_home_directory @@ -5,7 +5,7 @@ # makes a new home directory; defaults to one that does not use ssh -GIT_BASE=http://git.donarmstrong.com/ +GIT_BASE=https://git.donarmstrong.com/ if [ "$1" = "ssh" ]; then GIT_BASE=git+ssh://git.donarmstrong.com/srv/git/ @@ -83,6 +83,14 @@ if [ ! -e .ssh/authorized_keys ]; then (cd .ssh/; ln authorized_keys_default authorized_keys -s; ) fi; +if [ ! -e ~/bin/.git ]; then + # OK, bin must have already existed; check it out directly + mv bin bin.tmp; + PATH=~/bin.tmp:$PATH mr checkout bin; + mv bin.tmp/* bin; + rmdir bin.tmp; +fi; + # do some cleanup; you might want to run git reset --hard in some # cases; we don't do so automatically in case there are local changes # that should be kept