Skip to content

Commit 9d01b6d

Browse files
committed
Merge branch 'develop'
2 parents a3e5909 + 707fbd7 commit 9d01b6d

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# zImageOptimizer [![Version](https://img.shields.io/badge/version-v0.9.8-orange.svg)](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.8) [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.me/zevilz)
1+
# zImageOptimizer [![Version](https://img.shields.io/badge/version-v0.9.9-orange.svg)](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.9) [![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.me/zevilz)
22

33
Simple bash script for lossless image optimizing JPEG, PNG and GIF images in a specified directory include subdirectories on Linux, MacOS and FreeBSD.
44

@@ -410,6 +410,8 @@ Do you like the script? Would you like to support its development? Feel free to
410410
[![Donate](https://img.shields.io/badge/Donate-PayPal-blue.svg)](https://www.paypal.me/zevilz)
411411

412412
## Changelog
413+
- 04.05.2019 - 0.9.9 - bugfix (added check for using time marker in function fixTimeMarker)
414+
- 02.05.2019 - 0.9.8 - [changed logic of time marker, bugfix](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.8)
413415
- 02.05.2019 - 0.9.8 - [changed logic of time marker, bugfix](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.8)
414416
- 29.04.2019 - 0.9.7 - improved support for extensions, added new hooks and [more](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.7)
415417
- 20.04.2019 - 0.9.6 - added support for extensions, added lock file and [more](https://github.com/zevilz/zImageOptimizer/releases/tag/0.9.6)

zImageOptimizer.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# URL: https://github.com/zevilz/zImageOptimizer
44
# Author: Alexandr "zEvilz" Emshanov
55
# License: MIT
6-
# Version: 0.9.8
6+
# Version: 0.9.9
77

88
sayWait()
99
{
@@ -620,18 +620,20 @@ updateTimeMarker()
620620

621621
fixTimeMarker()
622622
{
623-
if [[ "$OSTYPE" == "darwin"* ]]; then
624-
TIME_MARKER_MODIFIED_TIME=$(stat -t %s -f %m -- "$TIME_MARKER_FULL_PATH")
625-
else
626-
TIME_MARKER_MODIFIED_TIME=$(date -r "$TIME_MARKER_FULL_PATH" +%s)
627-
fi
623+
if [ $NEW_ONLY -eq 1 ]; then
624+
if [[ "$OSTYPE" == "darwin"* ]]; then
625+
TIME_MARKER_MODIFIED_TIME=$(stat -t %s -f %m -- "$TIME_MARKER_FULL_PATH")
626+
else
627+
TIME_MARKER_MODIFIED_TIME=$(date -r "$TIME_MARKER_FULL_PATH" +%s)
628+
fi
628629

629-
TIME_MARKER_MODIFIED_TIME=$(echo "$TIME_MARKER_MODIFIED_TIME+1" | bc)
630+
TIME_MARKER_MODIFIED_TIME=$(echo "$TIME_MARKER_MODIFIED_TIME+1" | bc)
630631

631-
if date --version >/dev/null 2>/dev/null ; then
632-
touch -t $(date '+%Y%m%d%H%M.%S' -d @$TIME_MARKER_MODIFIED_TIME) "$TIME_MARKER_FULL_PATH" > /dev/null # GNU version of date
633-
else
634-
touch -t $(date -r $TIME_MARKER_MODIFIED_TIME +%Y%m%d%H%M.%S) "$TIME_MARKER_FULL_PATH" > /dev/null # Non GNU version of date
632+
if date --version >/dev/null 2>/dev/null ; then
633+
touch -t $(date '+%Y%m%d%H%M.%S' -d @$TIME_MARKER_MODIFIED_TIME) "$TIME_MARKER_FULL_PATH" > /dev/null # GNU version of date
634+
else
635+
touch -t $(date -r $TIME_MARKER_MODIFIED_TIME +%Y%m%d%H%M.%S) "$TIME_MARKER_FULL_PATH" > /dev/null # Non GNU version of date
636+
fi
635637
fi
636638
}
637639

0 commit comments

Comments
 (0)