simplify

1 files changed, 11 insertions, 17 deletions

diff --git a/wordpress/export-json.bash b/wordpress/export-json.bash
index fc65862..dc7703f 100644
--- a/wordpress/export-json.bash
+++ b/wordpress/export-json.bash
@@ -70,16 +70,10 @@ arg1_to_env0()
                         echo "Error: invalid variable: ${1@Q}" >&2
                         return 30
                         ;;
-                *[^a-zA-Z0-9_=]* )
+                *[^a-zA-Z0-9_=]* | [^a-zA-Z_]* | '')
                         echo "Error: invalid variable: ${1@Q}" >&2
                         return 10
                         ;;
-                [a-zA-Z_]* )
-                        ;;
-                * )
-                        echo "Error: invalid variable: ${1@Q}" >&2
-                        return 20
-                        ;;
         esac
         set -- "${1##*=}" "${1%%=*}"
         if [ -v "$2" ]
@@ -103,14 +97,14 @@ for_each()
 
 to_JSON_all()
 {
-        jq -s 'add' < \
-                <(
-                        if [ "$1" = '-a' ]
-                        then
-                                jq_env
-                        fi
-                        for_each to_JSON1 $(compgen -A arrayvar)
-                )
+        (
+                if [ "$1" = '-a' ]
+                then
+                        jq_env
+                fi
+                for_each to_JSON1 $(compgen -A arrayvar)
+        ) |
+        jq -s 'add'
 }
 
 jq_zip2()
@@ -188,8 +182,8 @@ to_JSON()
                 0 )
                         printf \
                                 '%s\n' \
-                                'usage: to_JSON -a' \
-                                '       to_JSON -A' \
+                                'usage: to_JSON -a    # print all' \
+                                '       to_JSON -A    # print arrays' \
                                 '       to_JSON <variable name> [...]' \
                                 >&2
                         return -1