Make image-info script more steady to special symbols in file names
This commit is contained in:
parent
93e2d03c73
commit
b32aefce3a
2
Makefile
2
Makefile
|
@ -1,4 +1,4 @@
|
||||||
VERSION := 1.3.2
|
VERSION := git-20151225
|
||||||
|
|
||||||
PREFIX := /usr/local
|
PREFIX := /usr/local
|
||||||
MANPREFIX := $(PREFIX)/share/man
|
MANPREFIX := $(PREFIX)/share/man
|
||||||
|
|
|
@ -7,13 +7,11 @@
|
||||||
|
|
||||||
s=" | " # field separator
|
s=" | " # field separator
|
||||||
|
|
||||||
filename=$(basename "$1")
|
filename=$(basename -- "$1")
|
||||||
filesize=$(du -Hh "$1" | cut -f 1)
|
filesize=$(du -Hh -- "$1" | cut -f 1)
|
||||||
|
|
||||||
geometry=$(identify -format '%wx%h' "$1[0]")
|
geometry=$(identify -format '%wx%h' ":$1[0]")
|
||||||
|
tags=$(identify -format '%[IPTC:2:25]' ":$1" | tr ';' ',')
|
||||||
tags=$(exiv2 -q -P v -g "Iptc.Application2.Keywords" "$1" | tr '\n' ',')
|
|
||||||
tags=${tags%,}
|
|
||||||
|
|
||||||
echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}"
|
echo "${filesize}${s}${geometry}${tags:+$s}${tags}${s}${filename}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue