From a5afda83b33c3cedae9e921e0d292b3c2e5f3e6a Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Thu, 30 Jan 2014 14:01:20 -0800 Subject: [PATCH] add more stuff to handle migrating existing home directories to mr --- new_home_directory | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/new_home_directory b/new_home_directory index 5c83ae1..7118ac1 100755 --- 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 -- 2.39.5