sh/jshn.sh - json_cleanup() dont pollute env with local vars

[project/libubox.git] / sh / jshn.sh

diff --git a/sh/jshn.sh b/sh/jshn.sh
index 176063f..06ba965 100644 (file)
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -103,7 +103,7 @@ json_set_namespace() {
 }
 
 json_cleanup() {
-       local unset
+       local unset tmp
 
        _json_get_var unset JSON_UNSET
        for tmp in $unset JSON_VAR; do
@@ -206,10 +206,11 @@ json_get_keys() {
 json_get_values() {
        local _v_dest="$1"
        local _v_keys _v_val _select=
+       local _json_no_warning=1
 
        unset "$_v_dest"
        [ -n "$2" ] && {
-               json_select "$2"
+               json_select "$2" || return 1
                _select=1
        }
 
@@ -231,13 +232,17 @@ json_get_var() {
 
        _json_get_var __cur JSON_CUR
        local __var="${JSON_PREFIX}${__cur}_${2//[^a-zA-Z0-9_]/_}"
-       eval "export -- \"$__dest=\${$__var}\"; [ -n \"\${$__var+x}\" ]"
+       eval "export -- \"$__dest=\${$__var:-$3}\"; [ -n \"\${$__var+x}\${3+x}\" ]"
 }
 
 json_get_vars() {
        while [ "$#" -gt 0 ]; do
                local _var="$1"; shift
-               json_get_var "$_var" "$_var"
+               if [ "$_var" != "${_var#*:}" ]; then
+                       json_get_var "${_var%%:*}" "${_var%%:*}" "${_var#*:}"
+               else
+                       json_get_var "$_var" "$_var"
+               fi
        done
 }
 
@@ -263,7 +268,8 @@ json_select() {
                        _json_set_var JSON_CUR "$cur"
                ;;
                *)
-                       echo "WARNING: Variable '$target' does not exist or is not an array/object"
+                       [ -n "$_json_no_warning" ] || \
+                               echo "WARNING: Variable '$target' does not exist or is not an array/object"
                        return 1
                ;;
        esac