DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jshn: fix some variable handling regressions

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
Felix Fietkau 2012-12-16 18:04:14 +01:00
parent e16fa068a5
commit 7bca5dd29d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sh/jshn.sh
View file

@ -113,7 +113,7 @@ _json_close_table() {
local stack new_stack local stack new_stack
_json_get_var stack JSON_STACK _json_get_var stack JSON_STACK
_json_set_var cur "${JSON_STACK##* }" _json_set_var JSON_CUR "${stack##* }"
new_stack="${stack% *}" new_stack="${stack% *}"
[[ "$stack" == "$new_stack" ]] && new_stack= [[ "$stack" == "$new_stack" ]] && new_stack=
_json_set_var JSON_STACK "$new_stack" _json_set_var JSON_STACK "$new_stack"
@ -219,19 +219,23 @@ json_get_vars() {
json_select() { json_select() {
local target="$1" local target="$1"
local type local type
local cur
[ -z "$1" ] && { [ -z "$1" ] && {
_json_set_var JSON_CUR "JSON_VAR" _json_set_var JSON_CUR "JSON_VAR"
return 0 return 0
} }
[[ "$1" == ".." ]] && { [[ "$1" == ".." ]] && {
eval "JSON_CUR=\"\${UP_$JSON_CUR}\"" _json_get_var cur JSON_CUR
_json_get_var cur "UP_$cur"
_json_set_var JSON_CUR "$cur"
return 0 return 0
} }
json_get_type type "$target" json_get_type type "$target"
case "$type" in case "$type" in
object|array) object|array)
_json_get_var JSON_CUR "$target" json_get_var cur "$target"
_json_set_var JSON_CUR "$cur"
;; ;;
*) *)
echo "WARNING: Variable '$target' does not exist or is not an array/object" echo "WARNING: Variable '$target' does not exist or is not an array/object"