X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/210d915d4e2f21b063ebd0f3f6d8277b4a331f93..6fc8ac07fccba0afb059de263db70787f2f6042c:/bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index ccbb328..678f896 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -17,10 +17,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-set -e
 set -f
 
-VERSION="1.1+arch"
+VERSION="1.1.1"
 
 function bpgallery_default_head() {
 cat <<END
@@ -486,7 +485,6 @@ function generate_pages() {
 			nextpage=${nextimage}.html
 		fi
 		filename=${extradir}${currentimage}
-		echo "'$previouspage' '$currentpage' '$nextpage' '$addlink'" >> /tmp/bpgallery-tmp.log
 		if [ "x$currentpage" != "x" ]; then
 			generate_general_page "$previouspage" "$currentpage" "$nextpage" $addlink
 		fi
@@ -525,8 +523,6 @@ function generate_medium_pages() {
 
 function generate_general_page() {
 
-	echo 'Generating the page...' >> /tmp/bpgallery-tmp.log
-
 	if [[ -z $1 ]]; then
 		previouspage=""
 	fi
@@ -545,7 +541,8 @@ function generate_general_page() {
 	fi
 
 	if [ -r captions.txt ]; then
-		caption=$($GREPCOMMAND -E "^${filename}   " captions.txt); caption=${caption#*    }
+		imagefilename=${filename##*/}
+		caption=$($GREPCOMMAND -E "^${imagefilename}	" captions.txt); caption=${caption#*	}
 	else
 		caption=""
 	fi