From b32aefce3a8c98c3ddb35f8f5e89b56ca757ad61 Mon Sep 17 00:00:00 2001
From: Sudo Nice <sudo.nice@gmail.com>
Date: Wed, 23 Dec 2015 12:43:20 +0300
Subject: [PATCH] Make image-info script more steady to special symbols in file
 names

---
 Makefile        |  2 +-
 exec/image-info | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 1b816c9..5346acd 100644
--- a/Makefile
+++ b/Makefile
@@ -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}"