X-Git-Url: https://git.sommitrealweird.co.uk/bpgallery.git/blobdiff_plain/d159b57ca37ebdb3b9a1ef690acb0010de5e3638..29a8c024297766b5b4d78424afddaae9a0365db7:/bpgallery.sh

diff --git a/bpgallery.sh b/bpgallery.sh
index 3350f20..ade52a5 100755
--- a/bpgallery.sh
+++ b/bpgallery.sh
@@ -240,39 +240,140 @@ if [[ -z $TITLE ]]; then
 fi
 
 if [[ -z $CONVERTTOOL ]]; then
-	CONVERTTOOL=convert
+	hash convert
+	if [[ $? != 0 ]]; then
+		echo "Can't find convert, exiting"
+		exit 3
+	fi
+	CONVERTTOOL=$(hash -t convert)
+else
+	if [[ ! -x $CONVERTTOOL ]]; then
+		echo "Can't find convert at location $CONVERTTOOL, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $FINDCOMMAND ]]; then
-	FINDCOMMAND=find
+	hash find
+	if [[ $? != 0 ]]; then
+		echo "Can't find find, exiting"
+		exit 3
+	fi
+	FINDCOMMAND=$(hash -t find)
+else
+	if [[ ! -x $FINDCOMMAND ]]; then
+		echo "Can't find find at $FINDCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $XARGSCOMMAND ]]; then
-	XARGSCOMMAND=xargs
+	hash xargs
+	if [[ $? != 0 ]]; then
+		echo "Can't find xargs, exiting"
+		exit 3
+	fi
+	XARGSCOMMAND=$(hash -t xargs)
+else
+	if [[ ! -x $XARGSCOMMAND ]]; then
+		echo "Can't find xargs at $XARGSCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $ECHOCOMMAND ]]; then
 	ECHOCOMMAND=echo
+else
+	if [[ ! -x $ECHOCOMMAND ]]; then
+		echo "Can't find echo at $ECHOCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $SORTCOMMAND ]]; then
-	SORTCOMMAND=sort
+	hash sort
+	if [[ $? != 0 ]]; then
+		echo "Can't find sort, exiting"
+		exit 3
+	fi
+	SORTCOMMAND=$(hash -t sort)
+else
+	if [[ ! -x $SORTCOMMAND ]]; then
+		echo "Can't find sort, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $IDENTIFYCOMMAND ]]; then
-	IDENTIFYCOMMAND=identify
+	hash identify
+	if [[ $? != 0 ]]; then
+		echo "Can't find indentify, exiting"
+		exit 3
+	fi
+	IDENTIFYCOMMAND=$(hash -t identify)
+else
+	if [[ ! -x $IDENTIFYCOMMAND ]]; then
+		echo "Can't find identify at $IDENTIFYCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $HEADCOMMAND ]]; then
-	HEADCOMMAND=head
+	hash head
+	if [[ $? != 0 ]]; then
+		echo "Can't find head, exiting"
+		exit 3
+	fi
+	HEADCOMMAND=$(hash -t head)
+else
+	if [[ ! -x $HEADCOMMAND ]]; then
+		echo "Can't find head at $HEADCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $GREPCOMMAND ]]; then
-	GREPCOMMAND=grep
+	hash grep
+	if [[ $? != 0 ]]; then
+		echo "Can't find grep, exiting"
+		exit 3
+	fi
+	GREPCOMMAND=$(hash -t grep)
+else
+	if [[ ! -x $GREPCOMMAND ]]; then
+		echo "Can't find grep at $GREPCOMMAND, exiting"
+		exit 3
+	fi
 fi
 
 if [[ -z $SEDCOMMAND ]]; then
-	SEDCOMMAND=sed
+	hash sed
+	if [[ $? != 0 ]]; then
+		echo "Can't find sed, exiting"
+		exit 3
+	fi
+	SEDCOMMAND=$(hash -t sed)
+else
+	if [[ ! -x $SEDCOMMAND ]]; then
+		echo "Can't find sed at $SEDCOMMAND, exiting"
+		exit 3
+	fi
+fi
+
+if [[ -z $WCCOMMAND ]]; then
+	hash wc
+	if [[ $? != 0 ]]; then
+		echo "Can't find wc, exiting"
+		exit 3
+	fi
+	WCCOMMAND=$(hash -t wc)
+	WCCOMMAND="$WCCOMMAND -l"
+else
+	if [[ ! -x $WCCOMMAND ]]; then
+		echo "Can't find wc at $WCCOMMAND, exiting"
+		exit 3
+	fi
+	WCCOMMAND="$WCCOMMAND -l"
 fi
 
 if [[ -z $WIDTH ]]; then
@@ -283,10 +384,6 @@ if [[ -z $IMAGEEXTENSIONS ]]; then
 	IMAGEEXTENSIONS="jpeg jpg gif png";
 fi
 
-if [[ -z $WCCOMMAND ]]; then
-	WCCOMMAND="wc -l"
-fi
-
 if [[ -z $CAPTIONHEIGHT ]]; then
 	CAPTIONHEIGHT=75
 fi
@@ -470,11 +567,19 @@ function generate_resized_images() {
 }
 
 function generate_thumbs() {
-	generate_resized_images $WIDTH $ICONSDIRECTORY
+	if [[ ! -z $HEIGHT ]]; then
+		generate_resized_images "${WIDTH}x${HEIGHT}" $ICONSDIRECTORY
+	else
+    	generate_resized_images $WIDTH $ICONSDIRECTORY
+	fi
 }
 
 function generate_medium() {
-	generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
+	if [[ ! -z $MEDIUMHEIGHT ]]; then
+		generate_resized_images "${WIDTH}x${HEIGHT}" $MEDIUMDIRECTORY
+	else
+		generate_resized_images $MEDIUMWIDTH $MEDIUMDIRECTORY
+	fi
 }
 
 function generate_pages() {