X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=sh%2Fjshn.sh;h=8ecefcf03f932fadb5a699b2bd9f3bd29664ddca;hp=7389f8c2a26ab743b7fb1aeb24f2c27be6138a6b;hb=a1a97eb11e89c420b84a659a88a4e72c7f04367d;hpb=dee81b4f7902c5b59654f4e8fdbb153bb4f67c62 diff --git a/sh/jshn.sh b/sh/jshn.sh index 7389f8c..8ecefcf 100644 --- a/sh/jshn.sh +++ b/sh/jshn.sh @@ -19,11 +19,15 @@ json_add_generic() { local val="$3" local cur="${4:-$JSON_CUR}" - [ "${cur%%[0-9]*}" = "JSON_ARRAY" ] && { + if [ "${cur%%[0-9]*}" = "JSON_ARRAY" ]; then eval "local aseq=\"\${SEQ_$cur}\"" var=$(( ${aseq:-0} + 1 )) export -- "SEQ_$cur=$var" - } + else + local name="$(echo -n "$var" | tr -C '[a-zA-Z_]' _)" + [[ "$name" == "$var" ]] || export -- "NAME_${cur}_${name}=$var" + var="$name" + fi export -- "${cur}_$var=$val" export -- "TYPE_${cur}_$var=$type"