Add a very rough progress meter

[bpgallery.git] / bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 6d38f0f630c1fab67e4e7cafe59f4c2d5902c8d8..a088ebfed5a51c4fb0a97c44a1b00fed70858d33 100755 (executable)
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -26,31 +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=/usr/bin/head
+       HEADCOMMAND=head
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -61,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
@@ -124,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"?>