diff --git a/files/scripts/compress_image.sh b/files/scripts/compress_image.sh index 9a915fc..037ee5f 100755 --- a/files/scripts/compress_image.sh +++ b/files/scripts/compress_image.sh @@ -28,7 +28,7 @@ function usage() { # Parameters: # 1) The exit status to use. status=$1 - echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c]] [-h] [-x] [-t]" >&2 + echo "Usage: $PROG [-s SIZE] [-l LOCATION] [-A | [-r] [-f] [-d] [-c] [-e | -t] [-h] [-x]" >&2 cat <<- EOF Compress JPG or PNG image(s). Can handle folders and work recursively. @@ -42,17 +42,17 @@ function usage() { -F : FORCE the image to be shrunk even if the file is already shrunk. -d : Delete the original image if the compressed image is smaller. -c : Clean the filename of underscores, dashes, 'IMG', etc. + -e | -t : Format timestamp to the expanded model. -A : Resursively Force, Delete, and Clean. -h : Display this usage text. -x : Enable BASH debugging. - -t : Format timestamp. EOF exit $status } ## Parameters ## -while getopts ":s:l:rfFdcAhxt" opt; do +while getopts ":s:l:rfFdcetAhx" opt; do case $opt in s) in_size="$OPTARG" && size="$in_size" ;; l) location="$OPTARG" ;; @@ -62,10 +62,10 @@ while getopts ":s:l:rfFdcAhxt" opt; do d) delete="Y" ;; c) clean="Y" ;; e) expand="Y" ;; - A) recurse="Y" && search="find" && force="Y" && delete="Y" && expand="Y" ;; + t) expand="Y" ;; + A) recurse="Y" && search="find" && force="Y" && delete="Y" ;; h) usage 0 ;; x) set -x ;; - t) format_time="Y" ;; *) echo "ERROR: Option $OPTARG not recognized." >&2 && usage 1 ;; esac done @@ -129,12 +129,10 @@ $search "$location" | sort | while read image; do ## Expanded Filename ## # Add back in the dashes so that the year, month, date, and time are exposed. TEMP="$new_image_clean" - if [[ "$format_time" == "Y" ]]; then - # Date Data - new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}" - # Time Data - new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}" - fi + # Date Data + new_image_exp="${TEMP:0:4}-${TEMP:4:2}-${TEMP:6:2}" + # Time Data + new_image_exp="${new_image_exp}_${TEMP:8:2}-${TEMP:10:2}-${TEMP:12:2}" # Remainder Data if [[ "${TEMP:14:1}" == "." ]]; then SEP=""