From: Chris Koeritz <cak0l@virginia.edu>
Date: Thu, 30 Jan 2020 20:37:13 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: 2.140.117^2~20
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=e3a57f3a794a14dc006b0c0109766aba80f0bc96;hp=4f163abff76af9aa3755d21750c1c84dbb18ea64

Merge branch 'master' into dev
---

diff --git a/infobase/feisty_inits/dot.bashrc-normal-user b/infobase/feisty_inits/dot.bashrc-normal-user
index 615970aa..f64bbcfc 100644
--- 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 e0facb15..b3ff3381 100644
--- 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 17c4b9b7..e0cebc6e 100644
--- 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