Skip to content

Commit 94e1528

Browse files
committed
Change [] to [[]]
1 parent 798c50d commit 94e1528

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

lib/json.bash

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ JSON.load() {
1212
case $# in
1313
0) (set -o pipefail; JSON.lex | JSON.parse) ;;
1414
1) JSON__cache="$(set -o pipefail; echo -E "$1" | JSON.lex | JSON.parse)"
15-
[ -n "$JSON__cache" ] && JSON__cache+=$'\n'
15+
[[ -n $JSON__cache ]] && JSON__cache+=$'\n'
1616
;;
1717
2) printf -v "$2" "%s" "$(echo -E "$1" | JSON.lex | JSON.parse)"
18-
[ -n "${!2}" ] && printf -v "$2" "%s\n" "${!2}"
18+
[[ -n ${!2} ]] && printf -v "$2" "%s\n" "${!2}"
1919
;;
2020
*) JSON.die 'Usage: JSON.load [<json-string> [<tree-var>]]' ;;
2121
esac
@@ -30,7 +30,7 @@ JSON.dump() {
3030
JSON.normalize | sort | JSON.emit-json
3131
;;
3232
1)
33-
if [ "$1" == '-' ]; then
33+
if [[ $1 == '-' ]]; then
3434
echo "$JSON__cache" | JSON.dump-json
3535
else
3636
echo ${!1} | JSON.dump-json
@@ -42,7 +42,7 @@ JSON.dump() {
4242

4343
JSON.get() {
4444
local flag=""
45-
if [[ $# -gt 0 ]] && [[ "$1" =~ ^-([asnbz])$ ]]; then
45+
if [[ $# -gt 0 && $1 =~ ^-([asnbz])$ ]]; then
4646
flag="${BASH_REMATCH[1]}"
4747
shift
4848
fi
@@ -52,7 +52,7 @@ JSON.get() {
5252
JSON.apply-get-flag "$flag"
5353
;;
5454
2)
55-
if [ "$2" == '-' ]; then
55+
if [[ $2 == '-' ]]; then
5656
echo "$JSON__cache" |
5757
grep -Em1 "^$1 " |
5858
cut -f2 |
@@ -70,7 +70,7 @@ JSON.get() {
7070

7171
JSON.put() {
7272
set -o pipefail
73-
if [[ $# -gt 0 ]] && [[ "$1" =~ ^-([snbz])$ ]]; then
73+
if [[ $# -gt 0 && $1 =~ ^-([snbz])$ ]]; then
7474
local flag="${BASH_REMATCH[1]}"
7575
shift
7676
fi
@@ -80,7 +80,7 @@ JSON.put() {
8080
printf "$1\t$2\n"
8181
;;
8282
3)
83-
if [ "$1" == '-' ]; then
83+
if [[ $1 == '-' ]]; then
8484
echo "$JSON__cache" | JSON.del "$1"
8585
printf "$1\t$2\n"
8686
else
@@ -99,7 +99,7 @@ JSON.del() {
9999
grep -Ev "$1 "
100100
;;
101101
2)
102-
if [ "$1" == '-' ]; then
102+
if [[ $1 == '-' ]]; then
103103
echo "$JSON__cache" | grep -Ev "$1 "
104104
else
105105
echo ${!1} | grep -Ev "$1 "
@@ -184,23 +184,23 @@ JSON.parse-value() {
184184
'[') JSON.parse-array "$1";;
185185
'{') JSON.parse-object "$1";;
186186
*)
187-
[[ "$JSON_token" =~ $JSON_SCALAR ]] ||
187+
[[ $JSON_token =~ $JSON_SCALAR ]] ||
188188
JSON.parse-error
189189
printf "%s\t%s\n" "$1" "$JSON_token"
190190
esac
191191
}
192192

193193
JSON.parse-error() {
194194
msg="JSON.parse error. Unexpected token: '$JSON_token'."
195-
[ -n "$1" ] && msg+=" Expected: $1."
195+
[[ -n $1 ]] && msg+=" Expected: $1."
196196
JSON.die "$msg"
197197
}
198198

199199
JSON.apply-get-flag() {
200200
local value
201201
read -r value
202202
# For now assume null can show up instead of string or number
203-
if [ "$value" == "null" ]; then
203+
if [[ $value == null ]]; then
204204
echo ''
205205
return 0
206206
fi
@@ -244,7 +244,7 @@ JSON.apply-get-flag() {
244244
}
245245

246246
JSON.assert-cache() {
247-
[ -n "$JSON__cache" ] || JSON.die 'JSON.get error: no cached data.'
247+
[[ -n $JSON__cache ]] || JSON.die 'JSON.get error: no cached data.'
248248
}
249249

250250
JSON.die() {

0 commit comments

Comments
 (0)