From 0608d1299546d4af1facc271a090cb2abb8c6105 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 30 May 2012 21:47:43 +0200
Subject: sh/jshn.sh: fix json_get_var() and json_get_type() to not return
 cached values

---
 sh/jshn.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sh')

diff --git a/sh/jshn.sh b/sh/jshn.sh
index a15cb00..0f209d3 100644
--- a/sh/jshn.sh
+++ b/sh/jshn.sh
@@ -95,13 +95,13 @@ json_dump() {
 json_get_type() {
 	local dest="$1"
 	local var="TYPE_${JSON_CUR}_$2"
-	eval "[ -n \"\${$var+x}\" ] && export -- \"$dest=\${$var}\""
+	eval "export -- \"$dest=\${$var}\"; [ -n \"\${$var+x}\" ]"
 }
 
 json_get_var() {
 	local dest="$1"
 	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() {
-- 
cgit v1.2.3