From 6d14a4c4936d56e622f16178b356efc4d3161ec6 Mon Sep 17 00:00:00 2001 From: Toke Eskildsen <te@ekot.dk> Date: Wed, 4 Dec 2013 21:57:54 +0100 Subject: [PATCH] Removed double setting import --- quack.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/quack.sh b/quack.sh index 8f97172..b91989d 100755 --- a/quack.sh +++ b/quack.sh @@ -151,6 +151,7 @@ SPECIFIC_FOLDER_SNIPPET="folder.snippet" SPECIFIC_IMAGE_SNIPPET_EXTENSION=".snippet" +START_PATH=`pwd` pushd `dirname $0` > /dev/null ROOT=`pwd` if [ -e "quack.settings" ]; then @@ -162,9 +163,11 @@ source "analyze.sh" popd > /dev/null # Local settings overrides general settings -if [ -e "quack.settings" ]; then - echo "Sourcing user settings from quack.settings in `pwd`" - source "quack.settings" +if [ ! "$START_PATH" == "$ROOT" ]; then + if [ -e "quack.settings" ]; then + echo "Sourcing user settings from quack.settings in `pwd`" + source "quack.settings" + fi fi -- GitLab