Used Carl's super-cool shell script shorthand to source system config file.

diff --git a/scripts/burn-imgs.sh b/scripts/burn-imgs.sh
index f33ea99251242a5a1affdc700c0df307f995d8b7..bffc5e9544345ed62e9b12352cedfc6edd27740a 100755 (executable)
--- a/scripts/burn-imgs.sh
+++ b/scripts/burn-imgs.sh
@@ -8,10 +8,7 @@ cronstopstart="/etc/init.d/cron"
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
 # If the noburn file is there then don't burn.
 [ -f "$noburnfile" ] && exit 0

diff --git a/scripts/cron-burn.sh b/scripts/cron-burn.sh
index f2ca41480a0f72984a3130338fcd67858103421d..4fe9a0b165ef26c4e84a82fa1afe38163330709c 100755 (executable)
--- a/scripts/cron-burn.sh
+++ b/scripts/cron-burn.sh
@@ -6,10 +6,7 @@ export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
 # burn-imgs.sh needs to be detached so that it can stop and start cron without
 # dying itself.

diff --git a/scripts/cron-pack.sh b/scripts/cron-pack.sh
index 62c65ad746dcac88e2bb5413ab212694e88bd1db..1594d68e5740316264a4cb21eebed7de6e5efb87 100755 (executable)
--- a/scripts/cron-pack.sh
+++ b/scripts/cron-pack.sh
@@ -6,10 +6,7 @@ export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
 if [ -n "$(find $lastbackupfile -mtime +14)" -o -n "$(cat $statusfile | grep -i incomplete)" ]; then
   echo "Running backups from cron..."

diff --git a/scripts/eject-disk.sh b/scripts/eject-disk.sh
index ca2795cc1051266c84332b2287f15bed428dfacc..811a4569bbdf0cab3ed6f84260092ba7c38543d2 100755 (executable)
--- a/scripts/eject-disk.sh
+++ b/scripts/eject-disk.sh
@@ -6,10 +6,7 @@ export PATH=$(dirname $0):/bin:/usr/bin:/sbin
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
 eject $dev
 

diff --git a/scripts/pack-image.sh b/scripts/pack-image.sh
index f2aae3ee1d9b97a0d2f229a781ed8e0a304163a8..b6557f6ba116e344957c14c777a2c828a5c43e61 100755 (executable)
--- a/scripts/pack-image.sh
+++ b/scripts/pack-image.sh
@@ -8,10 +8,7 @@ export PATH=$scriptsdir:/bin:/usr/bin:/sbin:/usr/sbin
 . config.sh
 
 # source the system specific configuration
-if [ -f /etc/lsbackups.conf ]
-then
-  . /etc/lsbackups.conf
-fi 
+[ -f /etc/lsbackups.conf ] && . /etc/lsbackups.conf
 
 # file locations and other values
 today=$(date +%Y%m%d%H%M%S)