From 9e12b2d098cddf0e64e39a2d7da68f4ce934087e Mon Sep 17 00:00:00 2001
From: Toke Eskildsen <te@ekot.dk>
Date: Wed, 4 Dec 2013 14:14:05 +0100
Subject: [PATCH] Feature: Allows for settings file in the calling dir instead
of the quack dir
---
quack.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/quack.sh b/quack.sh
index 789373e..a7eb86c 100755
--- a/quack.sh
+++ b/quack.sh
@@ -143,13 +143,21 @@ export SNIPPET_IMAGE=""
pushd `dirname $0` > /dev/null
ROOT=`pwd`
if [ -e "quack.settings" ]; then
- echo "Sourcing user settings from quack.settings"
+ echo "Sourcing user settings from quack.settings in `pwd`"
source "quack.settings"
fi
# functions for generating identify-files and extract greyscale statistics
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"
+fi
+
+
+
if [ ".true" == ".$FORCE_BLOWN" ]; then
# When we force regeneration of blown, we myst also regenerate the blown thumbs.
export FORCE_BLOWN_THUMBS=true
--
GitLab