From bd48deba77bd5582c5829d6fe73a7d2571088aba Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 12 Nov 2012 17:46:32 +0100 Subject: mpv_identify: stop using \n; fix property name handling Dashes are not valid in shell variable names. This changes them to underscores. --- TOOLS/mpv_identify.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'TOOLS/mpv_identify.sh') 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:" -- cgit v1.2.3