Fixes override of environment by config files

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 0d2009e47cdeb4a5c47596cf9947d42c913cb7b0..2cfb5ffe556e57b39621b2e38bd872c08e770521 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -19,7 +19,7 @@
 
 set -f
 
 
 set -f
 

-VERSION="0.9.3+arch"
+VERSION="1.0.0"

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


@@ -34,12 +34,25 @@ cat <<END
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_head
+
+function bpgallery_default_description() {
+cat <<END
+       <h1>${TITLE}</h1>
+       ${DESCRIPTION}
+END
+}
+
+declare -rf bpgallery_default_description
+

 function bpgallery_default_thumbsline() {
 cat << END
 <div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
 END
 }
 
 function bpgallery_default_thumbsline() {
 cat << END
 <div class="thumbnail"><a href="$filename"><img src="icons/$filename" /></a><div class="caption">$caption</div></div>
 END
 }
 

+declare -rf bpgallery_default_thumbsline
+

 function bpgallery_default_tail() {
 cat << END
 </body>
 function bpgallery_default_tail() {
 cat << END
 </body>


@@ -47,6 +60,8 @@ cat << END
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_tail
+

 function bpgallery_default_stylesheet() {
 cat <<END
 body {
 function bpgallery_default_stylesheet() {
 cat <<END
 body {


@@ -80,16 +95,26 @@ img {
 END
 }
 
 END
 }
 

+declare -rf bpgallery_default_stylesheet
+
+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
 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
 fi
 
 if [[ -e /etc/bpgallery/config ]] ; then

-       . /etc/bpgallery/config
+       . /etc/bpgallery/config 2>/dev/null

 fi
 
 if [[ -e $HOME/.bpgallery.rc ]]; then
 fi
 
 if [[ -e $HOME/.bpgallery.rc ]]; then

-       . $HOME/.bpgallery.rc
+       . $HOME/.bpgallery.rc 2>/dev/null

 fi
 
 if [[ -z ${BPGALLERY_THEME} ]]; then
 fi
 
 if [[ -z ${BPGALLERY_THEME} ]]; then


@@ -97,11 +122,11 @@ if [[ -z ${BPGALLERY_THEME} ]]; then
 fi
 
 if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then
 fi
 
 if [[ -e $HOME/.bpgallery.themes/${BPGALLERY_THEME} ]]; then

-       . $HOME/.bpgallery.themes/${BPGALLERY_THEME}
+       . $HOME/.bpgallery.themes/${BPGALLERY_THEME} 2>/dev/null

 elif [[ -e /usr/local/etc/bpgallery/themes/${BPGALLERY_THEME} ]]; then
 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
 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 
 fi
 
 if [[ -z $TITLE ]]; then 


@@ -140,6 +165,10 @@ if [[ -z $GREPCOMMAND ]]; then
        GREPCOMMAND=grep
 fi
 
        GREPCOMMAND=grep
 fi
 

+if [[ -z $SEDCOMMAND ]]; then
+       SEDCOMMAND=sed
+fi
+

 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi
 if [[ -z $WIDTH ]]; then
        WIDTH=100
 fi


@@ -162,6 +191,12 @@ else
        BPGALLERY_HEAD_FUNCTION="bpgallery_default_head"
 fi
 
        BPGALLERY_HEAD_FUNCTION="bpgallery_default_head"
 fi
 

+if declare -F "bpgallery_${BPGALLERY_THEME}_description" > /dev/null ; then
+       BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_${BPGALLERY_THEME}_description"
+else
+       BPGALLERY_DESCRIPTION_FUNCTION="bpgallery_default_description"
+fi
+

 if declare -F "bpgallery_${BPGALLERY_THEME}_thumbsline" > /dev/null ; then
        BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_${BPGALLERY_THEME}_thumbsline"
 else
 if declare -F "bpgallery_${BPGALLERY_THEME}_thumbsline" > /dev/null ; then
        BPGALLERY_THUMBSLINE_FUNCTION="bpgallery_${BPGALLERY_THEME}_thumbsline"
 else


@@ -238,19 +273,36 @@ fi
 
 if [ ! -d icons ]; then
        mkdir icons
 
 if [ ! -d icons ]; then
        mkdir icons

+
+       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
 else

-       echo "$1 already contains an icons folder, stopping"
-       exit 3
-fi
+       echo "$1 already contains an icons folder, updating."

 
 

-totalimages=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace echo {} | $WCCOMMAND);
-currentimage=0
+       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)

 
 

-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --verbose --max-procs=4 --replace $CONVERTTOOL -resize $WIDTH '{}' 'icons/{}' 2>&1 | while read throwout; do echo done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done
+       echo "images to update: $imagestoupdate"
+       
+       
+       currentimage=0
+
+       $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
+fi
+
+if [ -r description.txt ] ; then
+       DESCRIPTION=$($SEDCOMMAND -e '1 { s/^/<p>/; }; /^$/ { s,$,</p><p>,; }; $ { s,$,</p>, };' description.txt)
+else
+       DESCRIPTION=""
+fi

 
 

-echo done: $totalimages/$totalimages images

 
 $BPGALLERY_HEAD_FUNCTION > index.html
 
 $BPGALLERY_HEAD_FUNCTION > index.html

+$BPGALLERY_DESCRIPTION_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; $BPGALLERY_THUMBSLINE_FUNCTION; done >> 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; $BPGALLERY_THUMBSLINE_FUNCTION; done >> index.html
 


@@ -259,6 +311,7 @@ $BPGALLERY_TAIL_FUNCTION >> index.html
 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)

+MAXWIDTH=$($FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 $IDENTIFYCOMMAND -format "%w\n" | $GREPCOMMAND -v "^$" | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)

 
 cd ..
 
 
 cd ..