sh/jshn.sh: fix json_get_var() and json_get_type() to not return cached values

This commit is contained in:
Jo-Philipp Wich 2012-05-30 21:47:43 +02:00
parent c0b8aaab1a
commit 0608d12995

View file

@ -95,13 +95,13 @@ json_dump() {
json_get_type() { json_get_type() {
local dest="$1" local dest="$1"
local var="TYPE_${JSON_CUR}_$2" local var="TYPE_${JSON_CUR}_$2"
eval "[ -n \"\${$var+x}\" ] && export -- \"$dest=\${$var}\"" eval "export -- \"$dest=\${$var}\"; [ -n \"\${$var+x}\" ]"
} }
json_get_var() { json_get_var() {
local dest="$1" local dest="$1"
local var="${JSON_CUR}_${2//[^a-zA-Z0-9_]/_}" local var="${JSON_CUR}_${2//[^a-zA-Z0-9_]/_}"
eval "[ -n \"\${$var+x}\" ] && export -- \"$dest=\${$var}\"" eval "export -- \"$dest=\${$var}\"; [ -n \"\${$var+x}\" ]"
} }
json_get_vars() { json_get_vars() {