From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 15 May 2012 22:18:16 +0000 (+0200)
Subject: sh/jshn.sh: allow numbers in identifiers for json_get_var()
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=592f2dbd82c6cb9f85332c8056eed58374ac6dd0

sh/jshn.sh: allow numbers in identifiers for json_get_var()

When traversing arrays of tables or arrays of array it is required to
call json_select # where # is the index of the array item to select.

Internally json_select() calls json_get_var() to obtain the correct
prefix to populate $JSON_CUR with. However, the "tr" call in
json_get_var() incorrectly replaces all digits with underscores,
making any lookup for numeric array items fail.

The attached patch changes the "tr" expression to allow digits and
thus implements the expected behaviour for nested arrays.
---

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 117da67..7228adf 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -100,7 +100,7 @@ json_get_type() {
 
 json_get_var() {
 	local dest="$1"
-	local var="$(echo -n "$2" | tr -C '[a-zA-Z_]' _)"
+	local var="$(echo -n "$2" | tr -C '[a-zA-Z0-9_]' _)"
 	eval "export -- \"$dest=\${${JSON_CUR}_$var}\""
 }