From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 16 Nov 2013 18:36:04 +0000 (-0500)
Subject: updated for new paths also, which revealed a few locations that are
X-Git-Tag: 2.140.90~867
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=6479ddb15507675ad646ebc349676662d935fb0b;p=feisty_meow.git

updated for new paths also, which revealed a few locations that are
really not generalized.  these should be replaced with variables.
---

diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index 87a5c546..11172d0c 100644
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -40,7 +40,7 @@ local($root) = &canonicalize("$HOME/feisty_meow");
 # snarf up all the important directories.
 # CAK: current as of 2012-05-05.
 &backup_hierarchy($snarf_file_base, $number, $root, "customizing");
-&backup_hierarchy($snarf_file_base, $number, $root, "database");
+&backup_hierarchy($snarf_file_base, $number, $root, "infobase");
 &backup_hierarchy($snarf_file_base, $number, $root, "doc");
 &backup_hierarchy($snarf_file_base, $number, $root, "examples");
 &backup_hierarchy($snarf_file_base, $number, $root, "feisty_inits");
diff --git a/scripts/email/move_spams_and_check.sh b/scripts/email/move_spams_and_check.sh
index 80d13fd6..e4bfd43a 100644
--- a/scripts/email/move_spams_and_check.sh
+++ b/scripts/email/move_spams_and_check.sh
@@ -14,7 +14,7 @@ SPAM_SPOOL="/var/spool/sa-exim"
 SPAM_HOLD="$HOME/spamcrud"
 # the white list needs to be a file of good email addresses that will
 # probably never send spam.  it should be formatted one address to a line.
-EMAIL_WHITE_LIST="$HOME/cloud/database/lists/email_addresses.txt"
+EMAIL_WHITE_LIST="$HOME/cloud/infobase/lists/email_addresses.txt"
 # we'll save a report of the spam checks in the file below.
 REPORT_FILE="$HOME/spam_check_report_$(date_stringer).txt"
 
diff --git a/scripts/schedule/generate_reminders.pl b/scripts/schedule/generate_reminders.pl
index e8d8356e..e48ff584 100644
--- a/scripts/schedule/generate_reminders.pl
+++ b/scripts/schedule/generate_reminders.pl
@@ -43,7 +43,7 @@ local($CAL_FILE);
 if (! $CAL_FILE) {
 #  print "the CAL_FILE variable is not set.\n";
 #  print "defaulting it to a value that probably does not suit you.\n";
-  $CAL_FILE = "$CLOUD_DIR/database/lists/calendar.dat";
+  $CAL_FILE = "$CLOUD_DIR/infobase/lists/calendar.dat";
 }
 
 #print "calfile is $CAL_FILE\n";
diff --git a/scripts/security/pick_credentials.sh b/scripts/security/pick_credentials.sh
index b8f0696f..8b4b55e6 100644
--- a/scripts/security/pick_credentials.sh
+++ b/scripts/security/pick_credentials.sh
@@ -12,3 +12,6 @@ if [ ! -z "$(echo $* | grep -i sourceforge)" ]; then
   keyfile="$HOME/.ssh/id_dsa_sourceforge"
 fi
 
+if [ ! -f "$keyfile" ]; then
+  unset keyfile
+fi
diff --git a/scripts/security/ssh.sh b/scripts/security/ssh.sh
old mode 100755
new mode 100644
index 48add711..064ecf8a
--- a/scripts/security/ssh.sh
+++ b/scripts/security/ssh.sh
@@ -4,7 +4,11 @@
 
 source "$FEISTY_MEOW_SCRIPTS/security/pick_credentials.sh"
 
-\ssh -i "$keyfile" -X $*
+if [ ! -z "$keyfile" ]; then
+  \ssh -i "$keyfile" -X $*
+else
+  \ssh -X $*
+fi
 
 if [ $? -eq 0 ]; then
   # we don't want to emit anything extra if this is being driven by git.