X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/0bb2d087e1a6e4faae87f028f454c278827d2a6d..382e647023478b1c7f4e7f469cce2b81bf374c0f:/bpgallery.sh?ds=sidebyside

diff --git a/bpgallery.sh b/bpgallery.sh
index 3d82851..a088ebf 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -26,27 +26,31 @@ if [[ -z $TITLE ]]; then
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
-	CONVERTTOOL="/usr/bin/convert"
+	CONVERTTOOL=convert
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
-	FINDCOMMAND=/usr/bin/find
+	FINDCOMMAND=find
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
-	XARGSCOMMAND=/usr/bin/xargs
+	XARGSCOMMAND=xargs
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
-	ECHOCOMMAND=/bin/echo
+	ECHOCOMMAND=echo
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
-	SORTCOMMAND=/usr/bin/sort
+	SORTCOMMAND=sort
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
-	IDENTIFYCOMMAND=/usr/bin/identify
+	IDENTIFYCOMMAND=identify
+fi
+
+if [[ -z $HEADCOMMAND ]]; then
+	HEADCOMMAND=head
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -57,6 +61,10 @@ if [[ -z $IMAGEEXTENSIONS ]]; then
 	IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
+if [[ -z $WCCOMMAND ]]; then
+	WCCOMMAND="wc -l"
+fi
+
 FINDIMAGESOPTIONS=""
 
 for imageext in $IMAGEEXTENSIONS; do
@@ -120,7 +128,12 @@ else
 	exit 3
 fi
 
-$FINDCOMMAND . $FINDIMAGESOPTIONS | $XARGSCOMMAND -0 --replace $CONVERTTOOL -resize $WIDTH '{}' '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 echo done: $currentimage/$totalimages images; currentimage=$((currentimage+1)); done
+
+echo done: $totalimages/$totalimages images
 
 cat <<END > index.html
 <?xml version="1.0"?>
@@ -146,7 +159,7 @@ cd icons
 
 for imageext in $IMAGEEXTENSIONS; do
 	if ( ls "*.$imageext" > /dev/null 2>/dev/null ); then
-		TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | head -n 1)
+		TEMPMAX=$($IDENTIFYCOMMAND *.$imageext | grep "Geometry:" | sed -r 's#^.*Geometry:.*?[0-9]+x([0-9]+)\+.*$#\1#' | $SORTCOMMAND -g -r | $HEADCOMMAND -n 1)
 		if [[ $TEMPMAX -gt $MAXHEIGHT ]]; then
 			MAXHEIGHT=$TEMPMAX
 		fi