From f44f5658c45465c25c2326a845c620633c68ed60 Mon Sep 17 00:00:00 2001 From: Toke Eskildsen <te@ekot.dk> Date: Mon, 9 Dec 2013 14:29:36 +0100 Subject: [PATCH] Bugfix: The folder notes were taken from the last image processed --- quack.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/quack.sh b/quack.sh index 1950e1b..398decc 100755 --- a/quack.sh +++ b/quack.sh @@ -828,11 +828,6 @@ function makeIndex() { exit fi pushd $SRC_FOLDER > /dev/null - if [ -f $SPECIFIC_FOLDER_SNIPPET ]; then - SNIPPET=`cat $SPECIFIC_FOLDER_SNIPPET` - else - SNIPPET="$SNIPPET_FOLDER" - fi local SRC_FOLDER=`pwd` popd > /dev/null echo "Processing $SRC_FOLDER" @@ -910,7 +905,15 @@ function makeIndex() { done fi - # UP, PARENT, SRC_FOLDER, DEST_FOLDER, IMAGES_HTML, THUMBS_HTML, SUBFOLDERS_HTML, EDITION_HTML + pushd $SRC_FOLDER > /dev/null + if [ -f $SPECIFIC_FOLDER_SNIPPET ]; then + SNIPPET=`cat $SPECIFIC_FOLDER_SNIPPET` + else + SNIPPET="$SNIPPET_FOLDER" + fi + popd > /dev/null + + # UP, PARENT, SRC_FOLDER, DEST_FOLDER, IMAGES_HTML, THUMBS_HTML, SUBFOLDERS_HTML, EDITION_HTML, SNIPPET ctemplate $FOLDER_TEMPLATE > $PP # Generate pages for sub folders -- GitLab