X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=blobdiff_plain;f=new_home_directory;h=57e71882b52638caa2bb7d460e459a85330704fa;hp=22d26892cdbe51fd58e0b1364d79239e147e2a12;hb=HEAD;hpb=fe833c870d0d127143f16106f6ecb682de3178f6

diff --git a/new_home_directory b/new_home_directory
index 22d2689..3e492a3 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/
@@ -18,16 +18,20 @@ for pkg in mr vcsh; do
         echo "Package $pkg doesn't exist; getting it"
         mkdir -p local_packages/$pkg;
         (cd local_packages/$pkg;
+         deb_name=$pkg
+         if [ $pkg == "mr"; ]; then
+             deb_name=myrepos
+         fi;
          if which apt-get >/dev/null 2>&1; then
-             apt-get download $pkg;
-             dpkg-deb -x $pkg*.deb .
+             apt-get download $deb_name;
+             dpkg-deb -x ${deb_name}*.deb .
          else
              # ok, this host isn't Debian.
              if [ "$pkg" == "mr" ]; then
-                 wget http://http.debian.net/debian/pool/main/m/myrepos/myrepos_1.20150503_all.deb
+                 wget http://http.debian.net/debian/pool/main/m/myrepos/myrepos_1.20160123_all.deb
                  ar p myrepos*.deb data.tar.xz|xz --decompress|tar -x
              elif [ "$pkg" == "vcsh" ]; then
-                 wget http://http.debian.net/debian/pool/main/v/vcsh/vcsh_1.20150502-1_all.deb
+                 wget http://http.debian.net/debian/pool/main/v/vcsh/vcsh_1.20151229-1_all.deb
                  ar p vcsh*.deb data.tar.xz|xz --decompress|tar -x
              fi;
              
@@ -58,7 +62,7 @@ for a in lib bin; do
     fi;
 done;
 
-if [ "$1" == "ssh" ]; then
+if [ "$1" = "ssh" ]; then
     mkdir -p .config/;
     (cd .config/;
         git checkout git+ssh://git.donarmstrong.com/srv/git_private/mr.git
@@ -83,6 +87,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