From f0542d557cf408aab3606ce4143600a6c4af9b73 Mon Sep 17 00:00:00 2001 From: Camille Lafitte Date: Wed, 17 Jul 2019 17:59:10 +0200 Subject: [PATCH] Add cmin support * Follow cmin find argument * cf #5 --- optimize.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/optimize.sh b/optimize.sh index 104f0c7..f9dad52 100755 --- a/optimize.sh +++ b/optimize.sh @@ -13,6 +13,7 @@ CSI='\033[' CEND="${CSI}0m" CGREEN="${CSI}1;32m" +FIND_ARGS="" PNG_ARGS="" JPG_ARGS="" WEBP_ARGS="" @@ -31,6 +32,7 @@ _help() { echo " -q, --quiet ..... run image optimization quietly" echo " Other options :" echo " -h, --help, help ... displays this help information" + echo " --cmin ... File's status was last changed n minutes ago." echo "Examples:" echo " optimize all jpg images in /var/www/images" echo " img-optimize --jpg /var/www/images" @@ -96,6 +98,12 @@ else JPG_ARGS+=" --quiet" WEBP_ARGS+=" -quiet" ;; + --cmin) + if [ "$2" ]; then + FIND_ARGS+="-cmin $2" + shift + fi + ;; -h | --help | help) _help exit 1 @@ -160,7 +168,7 @@ if [ "$JPG_OPTIMIZATION" = "y" ]; then } echo -ne ' jpg optimization [..]\r' cd "$IMG_PATH" || exit 1 - find . -type f \( -iname "*.jpg" -o -iname "*.jpeg" \) -print0 | xargs -r -0 jpegoptim ${JPG_ARGS} --preserve --strip-all -m82 + find . -type f \( -iname "*.jpg" -o -iname "*.jpeg" \) ${FIND_ARGS} -print0 | xargs -r -0 jpegoptim ${JPG_ARGS} --preserve --strip-all -m82 echo -ne " jpg optimization [${CGREEN}OK${CEND}]\\r" echo -ne '\n' @@ -174,7 +182,7 @@ if [ "$PNG_OPTIMIZATION" = "y" ]; then echo -ne ' png optimization [..]\r' cd "$IMG_PATH" || exit 1 - find . -type f -iname '*.png' -print0 | xargs -r -0 optipng ${PNG_ARGS} -o5 -strip all + find . -type f -iname '*.png' ${FIND_ARGS} -print0 | xargs -r -0 optipng ${PNG_ARGS} -o5 -strip all echo -ne " png optimization [${CGREEN}OK${CEND}]\\r" echo -ne '\n' fi @@ -186,7 +194,7 @@ if [ "$WEBP_OPTIMIZATION" = "y" ]; then # convert png to webp echo -ne ' png to webp conversion [..]\r' cd "$IMG_PATH" || exit 1 - find . -type f -iname "*.png" -print0 | xargs -r -0 -I {} \ + find . -type f -iname "*.png" ${FIND_ARGS} -print0 | xargs -r -0 -I {} \ bash -c '[ ! -f "{}.webp" ] && { cwebp ${WEBP_ARGS} -z 9 -mt -quiet "{}" -o "{}.webp"; }' echo -ne " png to webp conversion [${CGREEN}OK${CEND}]\\r" @@ -195,7 +203,7 @@ if [ "$WEBP_OPTIMIZATION" = "y" ]; then # convert jpg to webp echo -ne ' jpg to webp conversion [..]\r' cd "$IMG_PATH" || exit 1 - find . -type f \( -iname "*.jpg" -o -iname "*.jpeg" \) -print0 | xargs -0 -I {} \ + find . -type f \( -iname "*.jpg" -o -iname "*.jpeg" \) ${FIND_ARGS} -print0 | xargs -0 -I {} \ bash -c '[ ! -f "{}.webp" ] && { cwebp ${WEBP_ARGS} -q 82 -mt "{}" -o "{}.webp"; }' echo -ne " jpg to webp conversion [${CGREEN}OK${CEND}]\\r"