From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 28 Jun 2006 04:30:21 +0000 (+0000)
Subject:  * update new_home_directory and make sa not run svn if it's just supposed to run... 
X-Git-Url: https://git.donarmstrong.com/?p=bin.git;a=commitdiff_plain;h=c8ce0187542cc73ed80d5d5c46a5c4bd9beca949

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

diff --git a/new_home_directory b/new_home_directory
index 2233e3c..90ceb18 100755
--- a/new_home_directory
+++ b/new_home_directory
@@ -19,9 +19,9 @@ mkdir .home_modules;
 )
 # make a home backup directory
 mkdir home_backup;
-mv .wgetrc home_backup/;
-mv .svn home_backup/;
-mv .sversionrc home_backup/;
+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
@@ -30,4 +30,8 @@ cat -<<EOF> .sa.d/sa_local
 ~/bin
 ~/lib
 EOF
+# 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
diff --git a/sa b/sa
index 0baa728..acf37df 100755
--- a/sa
+++ b/sa
@@ -97,9 +97,11 @@ my $HOME=$ENV{HOME};
 my $HOSTNAME=qx(hostname);
 $HOSTNAME=~s/\n//g;
 my $CAN_IGNORE_EXTERNALS = 0;
-qx(svn --version) =~ /\(r(\d+)\)/;
-if ($1 > 13838) {
-     $CAN_IGNORE_EXTERNALS = 1;
+if (not $options{hooks_only}) {
+     qx(svn --version) =~ /\(r(\d+)\)/;
+     if ($1 > 13838) {
+	  $CAN_IGNORE_EXTERNALS = 1;
+     }
 }
 
 sub available_config_files{