Add in OUTPUTHTML Option

Simplistic output of HTML from the script (just wraps it in a pre block)

git-archimport-id: arch@sommitrealweird.co.uk--2005-desktop/bpgallery--mainline--1.0--patch-18

diff --git a/README b/README
index 84a566bceb290db54a75779db37f9613b39d82cc..0825950c22e432e35b11b0e53ecc32e0c50b7d79 100644 (file)
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ The following environment variables can also be used:
         TITLE - the title of the gallery
         WIDTH - the width to make the icons
         BPGALLERY_THEME - set the theme to use (described below)
         TITLE - the title of the gallery
         WIDTH - the width to make the icons
         BPGALLERY_THEME - set the theme to use (described below)

+        OUTPUTHTML - sets the script output to be wrapped in a <pre> block

 
 Example Usage:
         TITLE="My Funky Gallery" bpgallery.sh /path/to/image/files
 
 Example Usage:
         TITLE="My Funky Gallery" bpgallery.sh /path/to/image/files

diff --git a/bpgallery.sh b/bpgallery.sh
index 631582116c871e8a26e6cb4bd9bcb7db93288f4d..8c186bb2f1ed04038b20839cc96d1dd6c5eedf1f 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -214,6 +214,10 @@ if [[ -z $CAPTIONHEIGHT ]]; then
        CAPTIONHEIGHT=75
 fi
 
        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
 if declare -F "bpgallery_${BPGALLERY_THEME}_head" > /dev/null ; then
        BPGALLERY_HEAD_FUNCTION="bpgallery_${BPGALLERY_THEME}_head"
 else


@@ -292,6 +296,10 @@ function generate_thumbs() {
        $ECHOCOMMAND "Completed generating thumbs for $totalimages images"
 }
 
        $ECHOCOMMAND "Completed generating thumbs for $totalimages images"
 }
 

+if [[ $OUTPUTHTML != 0 ]]; then
+       $ECHOCOMMAND "<pre>"
+fi
+

 if [[ -z $1 ]]; then
        $ECHOCOMMAND "No path given"
        usage
 if [[ -z $1 ]]; then
        $ECHOCOMMAND "No path given"
        usage


@@ -360,3 +368,7 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 $ECHOCOMMAND "All done"
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 $ECHOCOMMAND "All done"

+
+if [[ $OUTPUTHTML != 0 ]]; then
+       $ECHOCOMMAND "</pre>"
+fi