robustified resize and explictly called perl-rename

1 files changed, 18 insertions, 8 deletions

diff --git a/resize.sh b/resize.sh
index 54c7b77..24baaf7 100755
--- a/resize.sh
+++ b/resize.sh
@@ -1,27 +1,37 @@
 #! /bin/bash
 # resize photos and put them in a subdirectory
-# default is 20% but can add in  an arg later
-
+# default is 25% but can add in  an arg later
 
+# check for resize arg in command line
 if [ -z $1 ] 
 	then reduce=25
 	else reduce=$1
 fi
 
+# Check for folder name in command line (no spaces of course!)
 if [ -z $2 ]
 	then smldir='sml'
 	else smldir=$2
 fi
 
-
-mkdir $smldir
-rename -v 's/\s/_/g' *
-if [ $(ls -l *.JPG | wc -l) -gt 0 ]
-	then rename -v 's/.JPG$/.jpg/' *.JPG
+if [ ! -d $smldir ]
+    then mkdir $smldir
+    else echo "Folder \"$smldir\" already exists. No files were altered."; exit 1
 fi
 
-numpix=$(ls -l *.jpg | wc -l)
+# remove spaces from filenames
+perl-rename -v 's/\s/_/g' *
 
+# rename capital JPG to lower case jpg
+if [ $(ls -l *.JPG 2> /dev/null | wc -l) -gt 0 ]
+	then perl-rename -v 's/.JPG$/.jpg/' *.JPG
+fi
+
+numpix=$(ls -l *.jpg 2> /dev/null| wc -l)
+if [ $numpix -eq 0 ] 
+    then echo "No jpeg files in this folder"
+    exit 1 
+fi
 
 for file in *.jpg
 	do convert ${file} -resize ${reduce}% ${smldir}/sml-${file}