projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jshn: drop json_select warnings when called from json_get_values()
[project/libubox.git]
/
sh
/
jshn.sh
diff --git
a/sh/jshn.sh
b/sh/jshn.sh
index
85c4151
..
b3cd43c
100644
(file)
--- a/
sh/jshn.sh
+++ b/
sh/jshn.sh
@@
-206,6
+206,7
@@
json_get_keys() {
json_get_values() {
local _v_dest="$1"
local _v_keys _v_val _select=
json_get_values() {
local _v_dest="$1"
local _v_keys _v_val _select=
+ local _json_no_warning=1
unset "$_v_dest"
[ -n "$2" ] && {
unset "$_v_dest"
[ -n "$2" ] && {
@@
-267,7
+268,8
@@
json_select() {
_json_set_var JSON_CUR "$cur"
;;
*)
_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
return 1
;;
esac