Skip to content
Snippets Groups Projects
Commit f44f5658 authored by Toke Eskildsen's avatar Toke Eskildsen
Browse files

Bugfix: The folder notes were taken from the last image processed

parent aba8a35e
No related branches found
No related tags found
No related merge requests found
...@@ -828,11 +828,6 @@ function makeIndex() { ...@@ -828,11 +828,6 @@ function makeIndex() {
exit exit
fi fi
pushd $SRC_FOLDER > /dev/null 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` local SRC_FOLDER=`pwd`
popd > /dev/null popd > /dev/null
echo "Processing $SRC_FOLDER" echo "Processing $SRC_FOLDER"
...@@ -910,7 +905,15 @@ function makeIndex() { ...@@ -910,7 +905,15 @@ function makeIndex() {
done done
fi 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 ctemplate $FOLDER_TEMPLATE > $PP
# Generate pages for sub folders # Generate pages for sub folders
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment