nsxivb32aefc
Make image-info script more steady to special symbols in file names
+5 −7
2 files changed
- M Makefile +1 −1
- M exec/image-info +4 −6
| @@ -1,4 +1,4 @@ | |||
| 1 | − | VERSION := 1.3.2 | |
| 1 | + | VERSION := git-20151225 | |
| 2 | 2 | ||
| 3 | 3 | PREFIX := /usr/local | |
| 4 | 4 | MANPREFIX := $(PREFIX)/share/man | |
| @@ -7,13 +7,11 @@ | |||
| 7 | 7 | ||
| 8 | 8 | s=" | " # field separator | |
| 9 | 9 | ||
| 10 | − | filename=$(basename "$1") | |
| 11 | − | filesize=$(du -Hh "$1" | cut -f 1) | |
| 10 | + | filename=$(basename -- "$1") | |
| 11 | + | filesize=$(du -Hh -- "$1" | cut -f 1) | |
| 12 | 12 | ||
| 13 | − | geometry=$(identify -format '%wx%h' "$1[0]") | |
| 14 | − | ||
| 15 | − | tags=$(exiv2 -q -P v -g "Iptc.Application2.Keywords" "$1" | tr '\n' ',') | |
| 16 | − | tags=${tags%,} | |
| 13 | + | geometry=$(identify -format '%wx%h' ":$1[0]") | |
| 14 | + | tags=$(identify -format '%[IPTC:2:25]' ":$1" | tr ';' ',') | |
| 17 | 15 | ||
| 18 | 16 | echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}" | |
| 19 | 17 | ||