fi;
done;
+# .config is currently a link; this indicates that we are dealing with my old configuration system
+for a in .config; do
+ if [ -L ${a} ]; then
+ mv ${a} ${a}_bak;
+ mkdir -p ${a};
+ cp -r ${a}_bak/* ${a}/;
+ fi;
+done;
+
+for a in lib bin; do
+ if [ -d ${a}/.svn ]; then
+ mv ${a} ${a}.bak
+ fi;
+done;
+
if [ "$1" = "ssh" ]; then
mkdir -p .config/;
(cd .config/;
vcsh clone $GIT_BASE/mr.git mr;
fi;
mr checkout;
+
+for a in .zsh .ssh; do
+ if [ -L ${a} ]; then
+ mv ${a} ${a}_bak;
+ mr up;
+ mkdir -p ${a};
+ cp -r ${a}_bak/* ${a}/;
+ fi;
+done;
+
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