From 14ca323944bf0b6676da81b62db0447c0a7ba5f7 Mon Sep 17 00:00:00 2001
From: VirtuBox <contact@virtubox.net>
Date: Tue, 7 Aug 2018 00:48:47 +0200
Subject: [PATCH] improve jpg search

---
 cron/optimize-cron.sh |  9 ++++-----
 optimize.sh           | 14 +++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/cron/optimize-cron.sh b/cron/optimize-cron.sh
index 40a265e..ed3e6af 100644
--- a/cron/optimize-cron.sh
+++ b/cron/optimize-cron.sh
@@ -1,18 +1,17 @@
 input="sites.csv"
 while IFS='|' read -r f1 f2
 do
-  imagepath="$f2"
   # optimize jpg images created in the last 24 hours
-  find $imagepath -iname "*.jpg" -ctime 0 -print0 | xargs -0 jpegoptim --quiet --strip-all -m76
+  find $f2 -iname "*.jpg" -o -iname "*.jpeg" -ctime 0 -print0 | xargs -0 jpegoptim --quiet --strip-all -m76
   # optimize png images created in the last 24 hours
-  find $imagepath -iname '*.png' -ctime 0 -print0 | xargs -0 optipng -o7 -quiet -preserve
+  find $f2 -iname '*.png' -ctime 0 -print0 | xargs -0 optipng -o7 -quiet -preserve
   # convert png to webp
-  find $imagepath -iname "*.png" -ctime 0 -print0 | xargs -0 -I {}  \
+  find $f2 -iname "*.png" -ctime 0 -print0 | xargs -0 -I {}  \
   bash -c 'webp_version="$0".webp
   if [ ! -f "$webp_version" ]; then
      { cwebp -quiet -lossless {} -o {}.webp; }
   fi'
-  find $imagepath -iname "*.jpg" -ctime 0 -print0 | xargs -0 -I {} \
+  find $f2 -iname "*.jpg" -o -iname "*.jpeg" -ctime 0 -print0 | xargs -0 -I {} \
   bash -c 'webp_version="$0".webp
   if [ ! -f "$webp_version" ]; then
   { cwebp -quiet -lossless {} -o {}.webp; }
diff --git a/optimize.sh b/optimize.sh
index 31ff092..aa0e379 100644
--- a/optimize.sh
+++ b/optimize.sh
@@ -3,15 +3,11 @@ CSI="\\033["
 CEND="${CSI}0m"
 CGREEN="${CSI}1;32m"
 
-### Set Bins Path ###
-
-FIND=/usr/bin/find
-
 ##################################
 # Welcome
 ##################################
 
-imagepath="$1"
+
 
 echo ""
 echo "Welcome to optimize.sh image optimization script."
@@ -35,21 +31,21 @@ done
 
 # optimize jpg
 jpgoptimize() {
-$FIND  $imagepath -iname "*.jpg" -print0 | xargs -0 jpegoptim --preserve --quiet --strip-all -m82 
+find $1 -iname "*.jpg" -o -iname "*.jpeg" -print0 | xargs -0 jpegoptim --preserve --quiet --strip-all -m82 
 
         echo -ne "       jpg optimization                      [${CGREEN}OK${CEND}]\\r"
         echo -ne "\\n"
 }
 # optimize png
 pngoptimize() {
-$FIND $imagepath -iname '*.png' -print0 | xargs -0 optipng -o7 -strip all -quiet 
+find $1 -iname '*.png' -print0 | xargs -0 optipng -o7 -strip all -quiet 
 
         echo -ne "       png optimization                      [${CGREEN}OK${CEND}]\\r"
         echo -ne "\\n"
 }
 # convert png to webp
 webpconvert() {
-$FIND $imagepath -iname "*.png" -print0 | xargs -0 -I {}  \
+find $1 -iname "*.png" -print0 | xargs -0 -I {}  \
 bash -c 'webp_version="$0".webp
 if [ ! -f "$webp_version" ]; then
 { cwebp -quiet -z 9 -mt {} -o {}.webp; }
@@ -59,7 +55,7 @@ fi'
         echo -ne "\\n"
 
 # convert jpg to webp
-$FIND $imagepath -iname "*.jpg" -print0 | xargs -0 -I {} \
+find $1 -iname "*.jpg" -o -iname "*.jpeg" -print0 | xargs -0 -I {} \
 bash -c 'webp_version="$0".webp
 if [ ! -f "$webp_version" ]; then
 { cwebp -quiet -q 82 -mt {} -o {}.webp; }