General bug fixes

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index c26f826e26ecd545eed7135cf902caf954d3511a..631582116c871e8a26e6cb4bd9bcb7db93288f4d 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 

-VERSION="1.0.2"
+VERSION="1.0.2+arch"

 
 function bpgallery_default_head() {
 cat <<END
 
 function bpgallery_default_head() {
 cat <<END


@@ -70,18 +70,18 @@ declare -rf bpgallery_default_tail
 function bpgallery_default_stylesheet() {
 cat <<END
 body {
 function bpgallery_default_stylesheet() {
 cat <<END
 body {

-        background: white;
-        color: black;
-        font-family: sans-serif;
-        font-size: 10pt;
+       background: white;
+       color: black;
+       font-family: sans-serif;
+       font-size: 10pt;

 }
 
 div.thumbnail {
 }
 
 div.thumbnail {

-        float: left;
-        padding: 20px;
-        border: 0px;
-        width: ${WIDTH}px;
-        height: ${MAXHEIGHT}px;
+       float: left;
+       padding: 20px;
+       border: 0px;
+       width: ${WIDTH}px;
+       height: ${MAXHEIGHT}px;

 }
 
 div.caption {
 }
 
 div.caption {


@@ -91,11 +91,11 @@ div.caption {
 }
 
 a {
 }
 
 a {

-        border: 0px;
+       border: 0px;

 }
 
 img {
 }
 
 img {

-        border: 0px;
+       border: 0px;

 }
 END
 }
 }
 END
 }


@@ -334,13 +334,19 @@ else
 fi
 
 
 fi
 
 

+$ECHOCOMMAND "Starting to generate page"
+

 $BPGALLERY_HEAD_FUNCTION > index.html
 $BPGALLERY_DESCRIPTION_FUNCTION >> index.html
 
 $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; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
 
 $BPGALLERY_TAIL_FUNCTION >> index.html
 
 $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; filename=$(bpgallery_escape_url "$filename"); $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
 
 $BPGALLERY_TAIL_FUNCTION >> index.html
 

+$ECHOCOMMAND "Finished generating the page"
+$ECHOCOMMAND "Generating stylesheet"

 cd icons
 
 MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 cd icons
 
 MAXHEIGHT=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%h\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)


@@ -353,3 +359,4 @@ MAXHEIGHT=$((MAXHEIGHT+$CAPTIONHEIGHT))
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 
 
 $BPGALLERY_STYLESHEET_FUNCTION > style.css
 

+$ECHOCOMMAND "All done"