fix default .mrconfig

[bin.git] / new_home_directory

diff --git a/new_home_directory b/new_home_directory
index 57114676d942905ec557e21f153baa6958f54b86..f32e7aa68d7aa4cd519728fe824e95c48be77bfd 100755 (executable)
--- a/new_home_directory
+++ b/new_home_directory
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+# wget -O new_home_directory 'http://git.donarmstrong.com/?p=bin.git;a=blob_plain;f=new_home_directory;hb=HEAD'
+# sh new_home_directory;
+
+
 # makes a new home directory; defaults to one that does not use ssh
 GIT_BASE=http://git.donarmstrong.com/
 
@@ -20,8 +24,10 @@ for pkg in mr vcsh; do
         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;
 
@@ -40,7 +46,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
@@ -49,6 +55,7 @@ if [ "$1" = "ssh" ]; then
 else 
     vcsh clone $GIT_BASE/mr.git mr;
 fi;
+
 mr checkout;
 
 for a in .zsh .ssh; do
@@ -61,7 +68,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
@@ -69,3 +76,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;