Merge branch 'master' into dev

diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user
index 615970aa422bc56e1a333c0e38a10f6eef792bc7..f64bbcfcf3d5cd178eff7d7468d06f9ab9239e26 100644 (file)
--- a/infobase/feisty_inits/dot.bashrc-normal-user
+++ b/infobase/feisty_inits/dot.bashrc-normal-user
@@ -5,9 +5,11 @@
 
 ##############
 
-# drag in the default version of this file.  this may not be needed if your
-# .bashrc script already has substantial code or already does this.
-source /etc/bash.bashrc
+if [ -f /etc/bash.bashrc ]; then
+  # drag in the default version of this file.  this may not be needed if your
+  # .bashrc script already has substantial code or already does this.
+  source /etc/bash.bashrc
+fi
 
 ##############
 

diff --git a/infobase/feisty_inits/dot.bashrc-root b/infobase/feisty_inits/dot.bashrc-root
index e0facb150007d8b81a7e37f0802fc31e5fccf806..b3ff3381074e72f7ee45695602bb5a23e5d572bf 100644 (file)
--- a/infobase/feisty_inits/dot.bashrc-root
+++ b/infobase/feisty_inits/dot.bashrc-root
@@ -5,9 +5,11 @@
 
 ##############
 
-# drag in the default version of this file.  this may not be needed if your
-# .bashrc script already has substantial code or already does this.
-source /etc/bash.bashrc
+if [ -f /etc/bash.bashrc ]; then
+  # drag in the default version of this file.  this may not be needed if your
+  # .bashrc script already has substantial code or already does this.
+  source /etc/bash.bashrc
+fi
 
 ##############
 

diff --git a/scripts/archival/raw_synch.sh b/scripts/archival/raw_synch.sh
index 17c4b9b7f6e94e888315dbbb4ae6efeb49fd935a..e0cebc6e8a172a5610fb0a6e740655fefdfbdb32 100644 (file)
--- a/scripts/archival/raw_synch.sh
+++ b/scripts/archival/raw_synch.sh
@@ -12,10 +12,11 @@ echo "Updating our local archives from $synch_host: this is very raw mode, witho
 echo
 
 for currdir in basement imaginations musix toaster walrus; do
-  if [ -d /z/$currdir ]; then
+  if [ -d "/z/$currdir" ]; then
     sep
     echo "synching $currdir folder from $synch_host..."
     rsync -avz "$synch_host":/z/$currdir/* /z/$currdir/
+    continue_on_error synching with $currdir from remote host.
   fi
 done