${TITLE}

X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/489511a520f9dc32502658b066ffe8235e5cdd10..bd2b083210e038f02bd8ee677c0e7772d372c3a0:/bpgallery.sh?ds=inline diff --git a/bpgallery.sh b/bpgallery.sh index 9a4b765..ade52a5 100755 --- a/bpgallery.sh +++ b/bpgallery.sh @@ -19,7 +19,7 @@ set -f -VERSION="0.9.3+arch" +VERSION="1.1.1+arch" function bpgallery_default_head() { cat < ${TITLE} - + END } +declare -rf bpgallery_default_head + function bpgallery_default_description() { cat <${TITLE} @@ -41,12 +43,21 @@ cat <

$caption

END } +declare -rf bpgallery_default_thumbsline + function bpgallery_default_tail() { cat << END @@ -54,21 +65,23 @@ cat << END END } +declare -rf bpgallery_default_tail + function bpgallery_default_stylesheet() { cat <${caption} + +

+ ${linkstart}

${linkend} +

+END + $BPGALLERY_TAIL_FUNCTION +} + +declare -rf bpgallery_default_page + +function bpgallery_escape_url() { + temp=$1 + temp=${temp//\%/%25} + temp=${temp//:/%3A} + temp=${temp//;/%3B} + temp=${temp// /%20} + temp=${temp//$/%24} + temp=${temp//&/%26} + temp=${temp//+/%2B} + temp=${temp//,/%2C} + temp=${temp//\//%2F} + temp=${temp//=/%3D} + temp=${temp//\?/%3F} + temp=${temp//@/%40} + temp=${temp//\"/%22} + $ECHOCOMMAND $temp +} + +function bpgallery_cleanup_directory_name() { + temp=$1 + temp=${temp//\%/_} + temp=${temp//:/_} + temp=${temp//;/_} + temp=${temp// /_} + temp=${temp//$/_} + temp=${temp//&/_} + temp=${temp//+/_} + temp=${temp//,/_} + temp=${temp//\//_} + temp=${temp//=/_} + temp=${temp//\?/_} + temp=${temp//@/_} + temp=${temp//\"/_} + $ECHOCOMMAND $temp +} + +declare -rf bpgallery_escape_url + +if [[ ! -z ${BPGALLERY_THEME} ]] ; then + declare -r BPGALLERY_THEME +fi + +if [[ ! -z ${TITLE} ]] ; then + declare -r TITLE +fi + if [[ -e /usr/local/etc/bpgallery/config ]] ; then - . /usr/local/etc/bpgallery/config + . /usr/local/etc/bpgallery/config 2>/dev/null fi if [[ -e /etc/bpgallery/config ]] ; then - . /etc/bpgallery/config + . /etc/bpgallery/config 2>/dev/null fi if [[ -e $HOME/.bpgallery.rc ]]; then - . $HOME/.bpgallery.rc + . $HOME/.bpgallery.rc 2>/dev/null +fi + +if [[ -e $1 && -d $1 && -e $1/.bpgallery.rc ]]; then + . $1/.bpgallery.rc 2>/dev/null fi if [[ -z ${BPGALLERY_THEME} ]]; then BPGALLERY_THEME=default fi -if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then - . $HOME/.bpgallery.themes/${BPGALLERY_THEME} +if [[ ! -z ${BPGALLERY_THEME_DIR} ]] && \ + [[ -e ${BPGALLERY_THEME_DIR}/${BPGALLERY_THEME} ]]; then + . ${BPGALLERY_THEME_DIR}/${BPGALLERY_THEME} 2>/dev/null +elif [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then + . $HOME/.bpgallery.themes/${BPGALLERY_THEME} 2>/dev/null elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then - . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} + . /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null elif [[ -e /etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then - . /etc/bpgallery/themes/${BPGALLERY_THEME} + . /etc/bpgallery/themes/${BPGALLERY_THEME} 2>/dev/null fi if [[ -z $TITLE ]]; then @@ -116,39 +240,140 @@ if [[ -z $TITLE ]]; then fi if [[ -z $CONVERTTOOL ]]; then - CONVERTTOOL=convert + hash convert + if [[ $? != 0 ]]; then + echo "Can't find convert, exiting" + exit 3 + fi + CONVERTTOOL=$(hash -t convert) +else + if [[ ! -x $CONVERTTOOL ]]; then + echo "Can't find convert at location $CONVERTTOOL, exiting" + exit 3 + fi fi if [[ -z $FINDCOMMAND ]]; then - FINDCOMMAND=find + hash find + if [[ $? != 0 ]]; then + echo "Can't find find, exiting" + exit 3 + fi + FINDCOMMAND=$(hash -t find) +else + if [[ ! -x $FINDCOMMAND ]]; then + echo "Can't find find at $FINDCOMMAND, exiting" + exit 3 + fi fi if [[ -z $XARGSCOMMAND ]]; then - XARGSCOMMAND=xargs + hash xargs + if [[ $? != 0 ]]; then + echo "Can't find xargs, exiting" + exit 3 + fi + XARGSCOMMAND=$(hash -t xargs) +else + if [[ ! -x $XARGSCOMMAND ]]; then + echo "Can't find xargs at $XARGSCOMMAND, exiting" + exit 3 + fi fi if [[ -z $ECHOCOMMAND ]]; then ECHOCOMMAND=echo +else + if [[ ! -x $ECHOCOMMAND ]]; then + echo "Can't find echo at $ECHOCOMMAND, exiting" + exit 3 + fi fi if [[ -z $SORTCOMMAND ]]; then - SORTCOMMAND=sort + hash sort + if [[ $? != 0 ]]; then + echo "Can't find sort, exiting" + exit 3 + fi + SORTCOMMAND=$(hash -t sort) +else + if [[ ! -x $SORTCOMMAND ]]; then + echo "Can't find sort, exiting" + exit 3 + fi fi if [[ -z $IDENTIFYCOMMAND ]]; then - IDENTIFYCOMMAND=identify + hash identify + if [[ $? != 0 ]]; then + echo "Can't find indentify, exiting" + exit 3 + fi + IDENTIFYCOMMAND=$(hash -t identify) +else + if [[ ! -x $IDENTIFYCOMMAND ]]; then + echo "Can't find identify at $IDENTIFYCOMMAND, exiting" + exit 3 + fi fi if [[ -z $HEADCOMMAND ]]; then - HEADCOMMAND=head + hash head + if [[ $? != 0 ]]; then + echo "Can't find head, exiting" + exit 3 + fi + HEADCOMMAND=$(hash -t head) +else + if [[ ! -x $HEADCOMMAND ]]; then + echo "Can't find head at $HEADCOMMAND, exiting" + exit 3 + fi fi if [[ -z $GREPCOMMAND ]]; then - GREPCOMMAND=grep + hash grep + if [[ $? != 0 ]]; then + echo "Can't find grep, exiting" + exit 3 + fi + GREPCOMMAND=$(hash -t grep) +else + if [[ ! -x $GREPCOMMAND ]]; then + echo "Can't find grep at $GREPCOMMAND, exiting" + exit 3 + fi fi if [[ -z $SEDCOMMAND ]]; then - SEDCOMMAND=sed + hash sed + if [[ $? != 0 ]]; then + echo "Can't find sed, exiting" + exit 3 + fi + SEDCOMMAND=$(hash -t sed) +else + if [[ ! -x $SEDCOMMAND ]]; then + echo "Can't find sed at $SEDCOMMAND, exiting" + exit 3 + fi +fi + +if [[ -z $WCCOMMAND ]]; then + hash wc + if [[ $? != 0 ]]; then + echo "Can't find wc, exiting" + exit 3 + fi + WCCOMMAND=$(hash -t wc) + WCCOMMAND="$WCCOMMAND -l" +else + if [[ ! -x $WCCOMMAND ]]; then + echo "Can't find wc at $WCCOMMAND, exiting" + exit 3 + fi + WCCOMMAND="$WCCOMMAND -l" fi if [[ -z $WIDTH ]]; then @@ -159,16 +384,60 @@ if [[ -z $IMAGEEXTENSIONS ]]; then IMAGEEXTENSIONS="jpeg jpg gif png"; fi -if [[ -z $WCCOMMAND ]]; then - WCCOMMAND="wc -l" -fi - if [[ -z $CAPTIONHEIGHT ]]; then CAPTIONHEIGHT=75 fi -if [[ -z $DESCRIPTION ]]; then - DESCRIPTION="" +if [[ -z $OUTPUTHTML ]]; then + OUTPUTHTML=0 +fi + +if [[ -z $GENERATEPAGESFORFULLSIZE ]]; then + GENERATEPAGESFORFULLSIZE=0 +fi + +if [[ -z $GENERATEPAGESFORMEDIUMSIZE ]]; then + GENERATEPAGESFORMEDIUMSIZE=1 +fi + +if [[ -z $PAGESDIRECTORY ]]; then + PAGESDIRECTORY="" +else + removetrailingslashes=${PAGESDIRECTORY%/} + temp=$removetrailingslashes + while [[ $removetrailingslashes != $temp ]]; do + temp=$removetrailingslashes + removetrailingslashes=${temp%/} + done + PAGESDIRECTORY=$(bpgallery_escape_url "${PAGESDIRECTORY}") +fi + +if [[ -z $MEDIUMWIDTH ]]; then + MEDIUMWIDTH=400 +fi + +if [[ -z $INDEXDOCUMENT ]]; then + INDEXDOCUMENT=index.html +fi + +if [[ -z $MEDIUMDIRECTORY ]]; then + MEDIUMDIRECTORY=medium +else + # Strip out anything that might be broken + MEDIUMDIRECTORY=$(bpgallery_cleanup_directory_name "$MEDIUMDIRECTORY") +fi + +if [[ -z $ICONSDIRECTORY ]]; then + ICONSDIRECTORY=icons +else + # Strip out anything that might be broken + ICONSDIRECTORY=$(bpgallery_cleanup_directory_name "$ICONSDIRECTORY") +fi + +if declare -F "bpgallery_${BPGALLERY_THEME}_page" > /dev/null ; then + BPGALLERY_PAGE_FUNCTION="bpgallery_${BPGALLERY_THEME}_page" +else + BPGALLERY_PAGE_FUNCTION="bpgallery_default_page" fi if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then @@ -204,10 +473,11 @@ fi FINDIMAGESOPTIONS="" for imageext in $IMAGEEXTENSIONS; do - FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -maxdepth 1 -iname '*.$imageext' -print0' + FINDIMAGESOPTIONS=$FINDIMAGESOPTIONS' -o -type f -iname '*.$imageext' -print0' done FINDIMAGESOPTIONS=${FINDIMAGESOPTIONS## -o } +FINDIMAGESOPTIONS='-maxdepth 1 '${FINDIMAGESOPTIONS} function usage() { cat < block + + GENERATEPAGESFORMEDIUMSIZE + generate medium sized images and pages + + GENERATEPAGESFORFULLSIZE + decide wether to generate pages for the full size images or not + + INDEXDOCUMENT + name of the index page (e.g. index.html) + +Example: + TITLE="My Funky Gallery" WIDTH=200 INDEXDOCUMENT="welcome.html" GENERATEPAGESFORFULLSIZE=1 GENERATEPAGESFORMEDIUMSIZE=1 MEDIUMWIDTH=400 $0 /path/to/image/folder END } @@ -228,8 +530,190 @@ Version: $VERSION END } +function generate_resized_images() { + $ECHOCOMMAND "Generating $2" + currentimage=0 + totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $WCCOMMAND); + imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do filename=${filename//\"/\\\"}; if [ ! -r "$2/$filename" ] || [ "$filename" -nt "$2/$filename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND) + + if [ $totalimages -eq 0 ]; then + # might as well exit at this point - there are no pictures + $ECHOCOMMAND "No images for the gallery - exiting." + exit 64 + else + # check if the directory exists and create it other wise + if [ ! -d $2 ]; then + mkdir $2 + fi + + if [ ! -w $2 ]; then + $ECHOCOMMAND "Can't write to $2 directory, exiting" + exit 16 + fi + fi + + if [ $totalimages -eq $imagestoupdate ]; then + $ECHOCOMMAND "Regenerating all $2" + elif [ $imagestoupdate -eq 0 ]; then + $ECHOCOMMAND "No Updated $2, not regenerating" + return + else + $ECHOCOMMAND "Generating $imagestoupdate of $totalimages $2" + fi + + $FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | while read filename; do tempfilename=${filename//\"/\\\"/}; if [ ! -r "$2/$tempfilename" ] || [ "$tempfilename" -nt "$2/$tempfilename" ] || [ $($IDENTIFYCOMMAND -format "%w" "$2/$filename") -ne $1 ]; then $ECHOCOMMAND -n $filename; $ECHOCOMMAND -n -e "\000"; fi; done | $XARGSCOMMAND -0 --verbose --max-procs=4 -I {} $CONVERTTOOL -resize $1 '{}' $2/'{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done + $ECHOCOMMAND done: $imagestoupdate/$imagestoupdate images + $ECHOCOMMAND "Completed generating $2 for $totalimages images" +} + +function generate_thumbs() { + if [[ ! -z $HEIGHT ]]; then + generate_resized_images "${WIDTH}x${HEIGHT}" $ICONSDIRECTORY + else + generate_resized_images $WIDTH $ICONSDIRECTORY + fi +} + +function generate_medium() { + if [[ ! -z $MEDIUMHEIGHT ]]; then + generate_resized_images "${WIDTH}x${HEIGHT}" $MEDIUMDIRECTORY + else + generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY + fi +} + +function generate_pages() { + $ECHOCOMMAND "Generating Pages" + previouspage="" + currentpage="" + nextpage="" + previousimage="" + currentimage="" + nextimage="" + extra="" + extradir="" + addlinks=0 + + if [ ! -z $1 ]; then + extra=$1 + fi + + if [ ! -z $2 ]; then + extradir=$2/ + addlinks=1 + fi + + if [ -z $2 ] && [[ $GENERATEPAGESFORMEDIUMSIZE != 0 ]]; then + addlinks=2 + fi + + $FINDCOMMAND . $FINDIMAGESOPTIONS | \ + $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | \ + $SORTCOMMAND -g | \ + while read imagefilename; do + previousimage=$currentimage + currentimage=$nextimage + nextimage=${imagefilename#./} + addlink="" + + if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then + if [[ $addlinks == 1 ]]; then + addlink=${currentimage}.html + else + addlink=${currentimage}${extra}.html + fi + else + addlink=${currentimage} + fi + + previouspage=$currentpage + currentpage=$nextpage + if [[ $addlinks == 1 ]]; then + nextpage=${nextimage}${extra}.html + else + nextpage=${nextimage}.html + fi + + if [[ "x$PAGESDIRECTORY" != "x" ]]; then + filename=../${extradir}${currentimage} + else + filename=${extradir}${currentimage} + fi + if [ "x$currentpage" != "x" ]; then + generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink + fi + $ECHOCOMMAND $nextimage + done | tail -n 2 | ( + read previouspage + read currentpage + addlink="" + + if [[ $GENERATEPAGESFORFULLSIZE != 0 ]]; then + if [[ $addlinks == 1 ]]; then + addlink=${currentpage}.html + else + addlink=${currentpage}${extra}.html + fi + else + addlink=${currentpage} + fi + + if [[ "x$PAGESDIRECTORY" != "x" ]]; then + filename=../${extradir}${currentpage} + else + filename=${extradir}${currentpage} + fi + if [[ $addlinks == 1 ]]; then + currentpage=${currentpage}${extra}.html + previouspage=${previouspage}${extra}.html + else + currentpage=${currentpage}.html + previouspage=${previouspage}.html + fi + nextpage="" + generate_general_page "$previouspage" "$currentpage" "" $addlink + ) +} + +function generate_medium_pages() { + generate_pages __${MEDIUMDIRECTORY} ${MEDIUMDIRECTORY} +} + +function generate_general_page() { + + if [[ -z $1 ]]; then + previouspage="" + fi + + if [[ -z $2 ]]; then + currentpage="" + return + fi + + if [[ -z $3 ]]; then + nextpage="" + fi + + if [[ ! -z $4 ]]; then + linklocation=$4 + fi + + if [ -r captions.txt ]; then + imagefilename=${filename##*/} + caption=$($GREPCOMMAND -E "^${imagefilename} " captions.txt); caption=${caption#* } + else + caption="" + fi + + $BPGALLERY_PAGE_FUNCTION > "${UNIXPAGESDIRECTORY}$currentpage" +} + +if [[ $OUTPUTHTML != 0 ]]; then + $ECHOCOMMAND "

"
+fi
+
 if [[ -z $1 ]]; then
-	echo "No path given"
+	$ECHOCOMMAND "No path given"
 	usage
 	exit 1
 fi
@@ -245,7 +729,7 @@ if [[ "$1" == "--version" || "$1" == "-v" ]]; then
 fi
 
 if [[ ! -d $1 ]]; then
-	echo "$1 is not a directory"
+	$ECHOCOMMAND "$1 is not a directory"
 	usage
 	exit 2
 fi
@@ -253,31 +737,56 @@ fi
 cd "$1"
 
 if ( ! $FINDCOMMAND . $FINDIMAGESOPTIONS > /dev/null 2>/dev/null ); then
-	echo "$1 does not contain any images. Quitting."
+	$ECHOCOMMAND "$1 does not contain any images. Quitting."
 	exit 4
 fi
 
-if [ ! -d icons ]; then
-	mkdir icons
+if [ ! -w . ]; then
+	$ECHOCOMMAND "Can't write to images directory, exiting"
+	exit 8
+fi
 
-	totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
-	currentimage=0
-	
-	$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done
-	
-	echo done: $totalimages/$totalimages images
-else
-	echo "$1 already contains an icons folder, updating."
+if [ -e ${INDEXDOCUMENT} ] && [ ! -w ${INDEXDOCUMENT} ]; then
+	$ECHOCOMMAND "Can't write ${INDEXDOCUMENT}, exiting"
+	exit 8
+fi
+
+if [ -e style.css ] && [ ! -w style.css ]; then
+	$ECHOCOMMAND "Can't write style.css, exiting"
+	exit 8
+fi
 
-	imagestoupdate=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ]; then $ECHOCOMMAND $filename; fi; done | $WCCOMMAND)
+generate_thumbs
 
-	echo "images to update: $imagestoupdate"
-	
-	
-	currentimage=0
+if [[ "x$PAGESDIRECTORY" != "x" ]]; then
+	if [ ! -d $PAGESDIRECTORY ]; then
+		mkdir -p $PAGESDIRECTORY
+	fi
+
+	if [ ! -w $PAGESDIRECTORY ]; then
+		$ECHOCOMMAND "Can't write to $PAGESDIRECTORY directory, exiting"
+		exit 16
+	fi
+	UNIXPAGESDIRECTORY=$PAGESDIRECTORY/	
+	PAGESDIRECTORY=$(bpgallery_escape_url $PAGESDIRECTORY)/
+
+	BASEURL="../"
+else
+	BASEURL=""
+	UNIXPAGESDIRECTORY=""
+fi
 
-	$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} | while read filename; do if [ ! -r "icons/$filename" ] || [ "$filename" -nt "icons/$filename" ] ; then $ECHOCOMMAND $filename; fi; done | $XARGSCOMMAND --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do $ECHOCOMMAND done: $currentimage/$imagestoupdate images; currentimage=$((currentimage+1)); done
-	echo done: $imagestoupdate/$imagestoupdate images
+if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+	generate_medium
+	generate_medium_pages
+fi
+
+if [ $GENERATEPAGESFORFULLSIZE != 0 ]; then
+	if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+		generate_pages __${MEDIUMDIRECTORY}
+	else
+		generate_pages
+	fi
 fi
 
 if [ -r description.txt ] ; then
@@ -286,15 +795,27 @@ else
 	DESCRIPTION=""
 fi
 
+BASEURL=""
+
+$ECHOCOMMAND "Starting to generate page"
+
+$BPGALLERY_HEAD_FUNCTION > ${INDEXDOCUMENT}
+$BPGALLERY_DESCRIPTION_FUNCTION >> ${INDEXDOCUMENT}
 
-$BPGALLERY_HEAD_FUNCTION > index.html
-$BPGALLERY_DESCRIPTION_FUNCTION >> index.html
+$ECHOCOMMAND "Adding Captions"
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $ECHOCOMMAND {} |$SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename	" captions.txt); caption=${caption#*	}; else caption=""; fi; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
+extra=""
+if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then
+	extra=__${MEDIUMDIRECTORY}
+fi
+
+$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 -I {} $ECHOCOMMAND {} | $SORTCOMMAND -g | while read filename; do filename=${filename#./}; if [ -r captions.txt ]; then caption=$($GREPCOMMAND -E "^$filename	" captions.txt); caption=${caption#*	}; else caption=""; fi; if [ $GENERATEPAGESFORMEDIUMSIZE != 0 ]; then link=${PAGESDIRECTORY}$(bpgallery_escape_url "${filename}${extra}.html"); elif [ $GENERATEPAGESFORFULLSIZE != 0 ]; then link=${PAGESDIRECTORY}$(bpgallery_escape_url "${filename}.html"); else link=$(bpgallery_escape_url "$filename"); fi; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> ${INDEXDOCUMENT}
 
-$BPGALLERY_TAIL_FUNCTION >> index.html
+$BPGALLERY_TAIL_FUNCTION >> ${INDEXDOCUMENT}
 
-cd icons
+$ECHOCOMMAND "Finished generating the page"
+$ECHOCOMMAND "Generating stylesheet"
+cd $ICONSDIRECTORY
 
 MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
@@ -306,3 +827,8 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
+$ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "

" +fi