X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/b53a01a10ef10a699efae79e7b44d4e8d62eedd5..45211626bfa6edab803ddb4a80a29c1fa2890c34:/bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 6315821..1650485 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -150,7 +150,10 @@ if [[ -z ${BPGALLERY_THEME} ]]; then
 	BPGALLERY_THEME=default
 fi
 
-if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
+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} 2>/dev/null
@@ -214,6 +217,10 @@ if [[ -z $CAPTIONHEIGHT ]]; then
 	CAPTIONHEIGHT=75
 fi
 
+if [[ -z $OUTPUTHTML ]]; then
+	OUTPUTHTML=0
+fi
+
 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
 	BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
 else
@@ -292,6 +299,10 @@ function generate_thumbs() {
 	$ECHOCOMMAND "Completed generating thumbs for $totalimages images"
 }
 
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "<pre>"
+fi
+
 if [[ -z $1 ]]; then
 	$ECHOCOMMAND "No path given"
 	usage
@@ -360,3 +371,7 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 $ECHOCOMMAND "All done"
+
+if [[ $OUTPUTHTML != 0 ]]; then
+	$ECHOCOMMAND "</pre>"
+fi