diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-02 17:23:06 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-08-02 17:30:58 (GMT) |
| commit | 38b0ad32b152d31d61eb0a873d7d3de45926af03 (patch) | |
| tree | d6141ca15af98de685295b38e5bfcab888460f6c /scripts | |
| parent | 76505eee0b78bbe6fdb07c7c61af37adf6d02256 (diff) | |
Source config only if it exists
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/run-dogtail-tests | 4 | ||||
| -rwxr-xr-x | scripts/shell/start-sugar | 4 | ||||
| -rw-r--r-- | scripts/xinitrc | 2 |
3 files changed, 7 insertions, 3 deletions
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 |