add more stuff to handle migrating existing home directories to mr

diff --git a/new_home_directory b/new_home_directory
index 5c83ae177e435f049c6cbc5cbe577acc46a85db7..7118ac140042fa922f70d748620c73879ddaa0f7 100755 (executable)
--- a/new_home_directory
+++ b/new_home_directory
@@ -26,15 +26,19 @@ for pkg in mr vcsh; do
 done;
 
 # .config is currently a link; this indicates that we are dealing with my old configuration system
-if [ -L .config ]; then
-    mv .config .config_bak;
-    mkdir -p .config;
-    cp -r .config_bak/* .config/;
-fi;
+for a in .zsh .config; do
+    if [ -L ${a} ]; then
+        mv ${a} ${a}_bak;
+        mkdir -p ${a};
+        cp -r ${a}_bak/* ${a}/;
+    fi;
+done;
 
-if [ -d lib/.svn ]; then
-    mv lib/.svn lib/.svn_bak;
-fi;
+for a in lib bin; do 
+    if [ -d ${a}/.svn ]; then
+        mv ${a} ${a}.bak
+    fi;
+done;
 
 if [ "$1" = "ssh" ]; then
     mkdir -p .config/;
@@ -49,3 +53,9 @@ mr checkout;
 if [ ! -e .ssh/authorized_keys ]; then
     (cd .ssh/; ln authorized_keys_default authorized_keys -s;)
 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
+mr run git reset --soft origin/master
+mr up