From 38b0ad32b152d31d61eb0a873d7d3de45926af03 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Thu, 02 Aug 2012 17:23:06 +0000
Subject: Source config only if it exists

---
(limited to 'scripts')

diff --git a/scripts/run-dogtail-tests b/scripts/run-dogtail-tests
index 933d07e..7bd2d12 100755
--- a/scripts/run-dogtail-tests
+++ b/scripts/run-dogtail-tests
@@ -8,7 +8,9 @@ logsdir=$rootdir/logs
 display=`$scriptsdir/find-free-display`
 resolution=1024x768x16
 
-source $rootdir/config
+if [ -z $rootdir/config ]; then
+    source $rootdir/config
+fi
 
 minver="0.8.0"
 version=`python -c "import dogtail; print dogtail.__version__"`
diff --git a/scripts/shell/start-sugar b/scripts/shell/start-sugar
index ed60c04..70efdd2 100755
--- a/scripts/shell/start-sugar
+++ b/scripts/shell/start-sugar
@@ -5,6 +5,8 @@ scriptsdir=`dirname "$shelldir"`
 rootdir=`dirname "$scriptsdir"`
 display=`$scriptsdir/find-free-display`
 
-source $rootdir/config
+if [ -z $rootdir/config ]; then
+  source $rootdir/config
+fi
 
 xinit $scriptsdir/xinitrc -- $display
diff --git a/scripts/xinitrc b/scripts/xinitrc
index befd429..1d221e4 100644
--- a/scripts/xinitrc
+++ b/scripts/xinitrc
@@ -6,7 +6,7 @@ unset SESSION_MANAGER
 
 SCRIPTS_DIR=`dirname "$0"`
 ROOT_DIR=`dirname "$SCRIPTS_DIR"`
-ROOT_DIR -z "$ROOT_DIR" && ROOT_DIR=.
+test -z "$ROOT_DIR" && $ROOT_DIR=.
 
 if [ ! -f $ROOT_DIR/config ]; then
     touch $ROOT_DIR/config
--
cgit v0.9.1