X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=new_home_directory;h=22d26892cdbe51fd58e0b1364d79239e147e2a12;hb=1886c7247cb16ed68a78cd5550b152689a465999;hp=1b046788f7b54856f958f3d56e13841df63a5294;hpb=04180063d75d608e47e42aad10c0dd6b811ad4aa;p=bin.git

diff --git a/new_home_directory b/new_home_directory
index 1b04678..22d2689 100755
--- a/new_home_directory
+++ b/new_home_directory
@@ -18,14 +18,28 @@ for pkg in mr vcsh; do
         echo "Package $pkg doesn't exist; getting it"
         mkdir -p local_packages/$pkg;
         (cd local_packages/$pkg;
-            apt-get download $pkg;
-            dpkg-deb -x $pkg*.deb .
+         if which apt-get >/dev/null 2>&1; then
+             apt-get download $pkg;
+             dpkg-deb -x $pkg*.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
+                 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
+                 ar p vcsh*.deb data.tar.xz|xz --decompress|tar -x
+             fi;
+             
+         fi;
         );
         mkdir -p bin
         ln ~/local_packages/$pkg/usr/bin/$pkg bin/$pkg -s
         if [ "$pkg" == "mr" ]; then
-            echo "include = cat ~/local_packages/$pkg/usr/share/mr/*" >> ~/.mrconfig
+            echo -e "[DEFAULT]\ninclude = cat ~/local_packages/$pkg/usr/share/mr/*" >> ~/.mrconfig
         fi;
+        PATH="$HOME/local_packages/$pkg/usr/bin/:$PATH"
+        export PATH
     fi;
 done;
 
@@ -44,7 +58,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
@@ -53,6 +67,7 @@ if [ "$1" = "ssh" ]; then
 else 
     vcsh clone $GIT_BASE/mr.git mr;
 fi;
+
 mr checkout;
 
 for a in .zsh .ssh; do
@@ -65,7 +80,7 @@ for a in .zsh .ssh; do
 done;
 
 if [ ! -e .ssh/authorized_keys ]; then
-    (cd .ssh/; ln authorized_keys_default authorized_keys -s;)
+    (cd .ssh/; ln authorized_keys_default authorized_keys -s; )
 fi;
 
 # do some cleanup; you might want to run git reset --hard in some
@@ -73,3 +88,10 @@ fi;
 # that should be kept
 mr run git reset --soft origin/master
 mr up
+
+# move mr and vcsh to ~/bin if they are in ~/bin.bak
+for pkg in mr vcsh; do
+    if [ -e ~/bin.bak/$pkg ]; then
+        mv ~/bin.bak/$pkg ~/bin/;
+    fi;
+done;