diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | exec/image-info | 10 |
2 files changed, 5 insertions, 7 deletions
@@ -1,4 +1,4 @@ -VERSION := 1.3.2 +VERSION := git-20151225 PREFIX := /usr/local MANPREFIX := $(PREFIX)/share/man diff --git a/exec/image-info b/exec/image-info index f839a36..a14ee7a 100644 --- a/exec/image-info +++ b/exec/image-info @@ -7,13 +7,11 @@ s=" | " # field separator -filename=$(basename "$1") -filesize=$(du -Hh "$1" | cut -f 1) +filename=$(basename -- "$1") +filesize=$(du -Hh -- "$1" | cut -f 1) -geometry=$(identify -format '%wx%h' "$1[0]") - -tags=$(exiv2 -q -P v -g "Iptc.Application2.Keywords" "$1" | tr '\n' ',') -tags=${tags%,} +geometry=$(identify -format '%wx%h' ":$1[0]") +tags=$(identify -format '%[IPTC:2:25]' ":$1" | tr ';' ',') echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}" |