genwebgallery

changeset 15:326bcd4e1708

$PROGRAM instead of basename $0; printf instead of echo -n; command -v to test for installed convert
author meillo@marmaro.de
date Sat, 19 Apr 2008 21:20:37 +0200
parents 6273a788c4fd
children 84c08287caa1
files COPYRIGHT Makefile debian/control debian/copyright genwebgallery
diffstat 5 files changed, 26 insertions(+), 18 deletions(-) [+]
line diff
     1.1 --- a/COPYRIGHT	Sat Apr 19 11:38:29 2008 +0200
     1.2 +++ b/COPYRIGHT	Sat Apr 19 21:20:37 2008 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  License: MIT License
     1.5  
     1.6 -Copyright: 2007 by markus schnalke
     1.7 +Copyright: 2007, 2008 by markus schnalke
     1.8  
     1.9  Permission is hereby granted, free of charge, to any person obtaining
    1.10  a copy of this software and associated documentation files (the
     2.1 --- a/Makefile	Sat Apr 19 11:38:29 2008 +0200
     2.2 +++ b/Makefile	Sat Apr 19 21:20:37 2008 +0200
     2.3 @@ -2,12 +2,12 @@
     2.4  
     2.5  
     2.6  NAME=genwebgallery
     2.7 -VERSION = 0.4
     2.8 +VERSION = 0.5
     2.9  NV=${NAME}-${VERSION}
    2.10  
    2.11  DOCS=COPYRIGHT ChangeLog TODO
    2.12 - 
    2.13 -# paths 
    2.14 +
    2.15 +# paths
    2.16  PREFIX = /usr
    2.17  BINDIR = ${PREFIX}/bin
    2.18  MANDIR = ${PREFIX}/share/man
     3.1 --- a/debian/control	Sat Apr 19 11:38:29 2008 +0200
     3.2 +++ b/debian/control	Sat Apr 19 21:20:37 2008 +0200
     3.3 @@ -8,9 +8,17 @@
     3.4  Package: genwebgallery
     3.5  Architecture: all
     3.6  Depends: ${shlibs:Depends}, ${misc:Depends}, imagemagick
     3.7 -Description: generates a web gallery with static html
     3.8 +Description: generates a minimalistic web gallery
     3.9   *** unofficial package from meillo@marmaro.de ***
    3.10   .
    3.11 - Very simple tool to generate static html pages to view pictures on the web.
    3.12 + Very simple tool to generate static HTML pages to view
    3.13 + pictures on the web.
    3.14 + The generated pages are not very beautiful, but simple.
    3.15 + They contain just what is really needed - no fancy stuff.
    3.16 + Also the generation process is only one program call. You
    3.17 + can specify some configuration options like the dimension
    3.18 + of the created thumbnails, the name of the index page and
    3.19 + some more.
    3.20 + All image processing is done via ImageMagick.
    3.21   .
    3.22   Homepage: http://prog.marmaro.de
     4.1 --- a/debian/copyright	Sat Apr 19 11:38:29 2008 +0200
     4.2 +++ b/debian/copyright	Sat Apr 19 21:20:37 2008 +0200
     4.3 @@ -5,7 +5,7 @@
     4.4  
     4.5  Upstream Author: markus schnalke <meillo@marmaro.de>
     4.6  
     4.7 -Copyright: 2007 by markus schnalke
     4.8 +Copyright: 2007, 2008 by markus schnalke
     4.9  
    4.10  License: MIT License
    4.11  
     5.1 --- a/genwebgallery	Sat Apr 19 11:38:29 2008 +0200
     5.2 +++ b/genwebgallery	Sat Apr 19 21:20:37 2008 +0200
     5.3 @@ -7,7 +7,8 @@
     5.4  #
     5.5  
     5.6  
     5.7 -VERSION=0.4
     5.8 +PROGRAM=genwebgallery
     5.9 +VERSION=0.5
    5.10  
    5.11  verbose="no"
    5.12  targetDir="webgallery"
    5.13 @@ -26,7 +27,7 @@
    5.14  	if [ -e "$targetDir" ] ; then
    5.15  		if [ "$overwrite" = "no" ] ; then
    5.16  			echo "output directory '$targetDir' already exists."
    5.17 -			echo -n "remove it? [y/n] "
    5.18 +			printf "remove it? [y/n] "
    5.19  			read remove
    5.20  		fi
    5.21  
    5.22 @@ -88,8 +89,7 @@
    5.23  
    5.24  checkConvert() {
    5.25  	log "checking convert installation"
    5.26 -	(convert -version) 2> /dev/null > /dev/null
    5.27 -	if [ $? -ne 0 ] ; then
    5.28 +	if [ ! `command -v convert` ] ; then
    5.29  		echo "Can not find 'convert' (package imagemagick)"
    5.30  		echo "ABORT"
    5.31  		exit 2
    5.32 @@ -101,18 +101,18 @@
    5.33  
    5.34  
    5.35  usage() {
    5.36 -	echo "usage: `basename $0` [OPTIONS] FILES"
    5.37 +	echo "usage: $PROGRAM [OPTIONS] FILES"
    5.38  	exit 1
    5.39  }
    5.40  
    5.41  
    5.42  
    5.43  help() {
    5.44 -	echo "`basename $0`
    5.45 +	echo "$PROGRAM
    5.46  
    5.47  generates a web gallery consisting of html pages
    5.48  
    5.49 -usage: `basename $0` [OPTIONS] PICTURES
    5.50 +usage: $PROGRAM [OPTIONS] PICTURES
    5.51  
    5.52  options:
    5.53  	--version   print program version
    5.54 @@ -122,11 +122,11 @@
    5.55  	-i FILE     the name of the index file ($index)
    5.56  	-t TEXT     title of the gallery ($galleryTitle)
    5.57  	-c TEXT     a copyright notice ($copyright)
    5.58 -	-ps PIXELS  size of the pics ($sizePic)
    5.59 +	-ps PIXELS  size of the pictures ($sizePic)
    5.60  	-ts PIXELS  size of the thumbnails ($sizeThumb)
    5.61  	--overwrite overwrite output directory ($overwrite)
    5.62  
    5.63 -for more information see man page: genwebgallery(1)
    5.64 +for more information see man page: $PROGRAM(1)
    5.65  
    5.66  author: meillo@marmaro.de
    5.67  homepage: http://prog.marmaro.de
    5.68 @@ -142,7 +142,7 @@
    5.69  while [  "$#" -ge 1  -a  `echo "$1" | awk '{print substr($0,1,1)}'` = '-'  ] ; do
    5.70  	case $1 in
    5.71  		'--version')
    5.72 -			echo "genwebgallery version $VERSION"
    5.73 +			echo "$PROGRAM version $VERSION"
    5.74  			exit 0
    5.75  			;;
    5.76  		'--help')
    5.77 @@ -188,7 +188,7 @@
    5.78  			;;
    5.79  		*)
    5.80  			echo "invalid option: $1"
    5.81 -			echo "see: `basename $0` --help"
    5.82 +			echo "see: $PROGRAM --help"
    5.83  			exit 1
    5.84  	esac
    5.85