diff --git a/quack.sh b/quack.sh index 789373e0930d2fe2189b843bf29961532d14475e..a7eb86cb8e4be8ffb49a7ade70a72522e1f8905b 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