* update new_home_directory and make sa not run svn if it's just supposed to run...

[bin.git] / new_home_directory

diff --git a/new_home_directory b/new_home_directory
index 6bd7b3d27f255be631bda5fee845e969811a62da..90ceb187e1a7f6a72efef75c448b51acfa91a15f 100755 (executable)
--- a/new_home_directory
+++ b/new_home_directory
@@ -19,13 +19,19 @@ mkdir .home_modules;
 )
 # make a home backup directory
 mkdir home_backup;
-mv .wgetrc .svn .sversionrc home_backup/;
-# run the appropriate command to set the symlinks correctly
-sh -c "$(awk -F '      ' '{print $2}' ~/.home_modules/base/sa_base) ~/.home_modules;"
+for a in .wgetrc .svn .sversionrc .subversion .bash_profile .bashrc .ssh; do
+    mv $a home_backup/;
+done;
 mkdir .sa.d;
 ln -s ~/.home_modules/*/sa_* .sa.d/;
+# run the appropriate command to set the symlinks correctly
+~/bin/sa --hooks-only update
 cat -<<EOF> .sa.d/sa_local
 ~/bin
 ~/lib
 EOF
-exec sa update;
\ No newline at end of file
+# move back the .ssh stuff
+if [ -e home_backup/.ssh ]; then
+    cp -f home_backup/.ssh/* .ssh/;
+fi;
+exec ~/bin/sa update;
\ No newline at end of file