summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2012-11-12 17:46:32 +0100
committerRudolf Polzer <divverent@xonotic.org>2012-11-12 17:54:45 +0100
commitbd48deba77bd5582c5829d6fe73a7d2571088aba (patch)
treee6426a4d87e72b35492eaae6ca838b1615e00eb9
parent0165ab5402c3ec472e877042b38cc03c952ac54c (diff)
downloadmpv-bd48deba77bd5582c5829d6fe73a7d2571088aba.tar.bz2
mpv-bd48deba77bd5582c5829d6fe73a7d2571088aba.tar.xz
mpv_identify: stop using \n; fix property name handling
Dashes are not valid in shell variable names. This changes them to underscores.
-rwxr-xr-xTOOLS/mpv_identify.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/TOOLS/mpv_identify.sh b/TOOLS/mpv_identify.sh
index d09504ab57..b3bc0481ef 100755
--- a/TOOLS/mpv_identify.sh
+++ b/TOOLS/mpv_identify.sh
@@ -91,9 +91,10 @@ __midentify__allprops="
"
# TODO add metadata support once mpv can do it
-__midentify__propstr="X-MIDENTIFY-START:\\n"
+__midentify__propstr="X-MIDENTIFY-START:$__midentify__LF"
for __midentify__key in $__midentify__allprops; do
- __midentify__propstr=$__midentify__propstr"X-MIDENTIFY: $__midentify__key \${=$__midentify__key}\\n"
+ __midentify__propstr=$__midentify__propstr"X-MIDENTIFY: $__midentify__key \${=$__midentify__key}$__midentify__LF"
+ __midentify__key=`echo "$__midentify__key" | tr - _`
eval unset $__midentify__nextprefix$__midentify__key
done
@@ -124,6 +125,7 @@ while :; do
__midentify__fileindex=$(($__midentify__fileindex+1))
__midentify__nextprefix=$__midentify__nextprefix$__midentify__fileindex\_
for __midentify__key in $__midentify__allprops; do
+ __midentify__key=`echo "$__midentify__key" | tr - _`
eval unset $__midentify__nextprefix$__midentify__key
done
else
@@ -137,6 +139,7 @@ while :; do
__midentify__key=${__midentify__line#X-MIDENTIFY:\ }
__midentify__value=${__midentify__key#* }
__midentify__key=${__midentify__key%% *}
+ __midentify__key=`echo "$__midentify__key" | tr - _`
if [ -n "$__midentify__nextprefix" ]; then
if [ -z "$__midentify__prefix" ]; then
echo >&2 "Got X-MIDENTIFY: without X-MIDENTIFY-START:"