mirror/ioccc
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update bin tools to use JSONPath.sh Version 0.0.22

Browse Source 
The `JSONPath.sh` has been updated (and bug fixed).
The `-A` option is gone and `-4` has been added.
See: https://github.com/lcn2/JSONPath.sh

Changed `bin/jfmt-wrapper.sh` VERSION from "2.0.0 2025-03-13"
to "2.0.1 2025-04-21".

Changed `bin/jprint-wrapper.sh` VERSION from "2.0.0 2025-03-13"
to "2.0.1 2025-04-21".

Changed `bin/jval-wrapper.sh` VERSION from "2.0.0 2025-03-13"
to "2.0.1 2025-04-21".

Tested the above via `make www gen_status gen_sitemap timestamp` on macOS.
This commit is contained in:
Landon Curt Noll committed 2025-04-21 01:28:19 -07:00
1 parent 2368b8ded5
commit 8ed2de8456
4 files changed
+33 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/jfmt-wrapper.sh
+12 -12
View File
@@ -128,7 +128,7 @@ export LC_ALL="C"
# set variables referenced in the usage message # set variables referenced in the usage message
# #
export VERSION="2.0.0 2025-03-13" export VERSION="2.0.1 2025-04-21"
NAME=$(basename "$0") NAME=$(basename "$0")
export NAME export NAME
export V_FLAG=0 export V_FLAG=0
@@ -358,7 +358,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: JSONPath.sh tool is not installed, is not executable, or not in \$PATH" 1>&2 echo "$0: ERROR: JSONPath.sh tool is not installed, is not executable, or not in \$PATH" 1>&2
echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2 echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: obtain JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: obtain JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi fi
@@ -366,12 +366,12 @@ case "$XPATHJSON_USE" in
# case: -Q - perform quick check # case: -Q - perform quick check
# #
if [[ -n $QUICK_CHECK ]]; then if [[ -n $QUICK_CHECK ]]; then
# verify JSONPath.sh supports -S -A -p # verify JSONPath.sh supports -S -4 -p
if ! "$JSONPATH_SH" -S -A -p >/dev/null 2>&1; then if ! "$JSONPATH_SH" -S -4 -p >/dev/null 2>&1; then
echo "$0: ERROR: JSONPath.sh tool does not support -S -A: $FIZZBIN_JSON" 1>&2 echo "$0: ERROR: JSONPath.sh tool does not support -S -4 -p: $FIZZBIN_JSON" 1>&2
echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2 echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: otherwise install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi <<< "$FIZZBIN_JSON" fi <<< "$FIZZBIN_JSON"
@@ -388,7 +388,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: jsp.sh tool is not installed, is not executable, or not in \$PATH" 1>&2 echo "$0: ERROR: jsp.sh tool is not installed, is not executable, or not in \$PATH" 1>&2
echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2 echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: obtain JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: obtain JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi fi
@@ -401,7 +401,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: jsp tool does not support --indent 4 --format --no-color: $FIZZBIN_JSON" 1>&2 echo "$0: ERROR: jsp tool does not support --indent 4 --format --no-color: $FIZZBIN_JSON" 1>&2
echo "$0: notice: you might need to update and reinstall jsp from: $JSP_REPO" 1>&2 echo "$0: notice: you might need to update and reinstall jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: or you might try to obtain and install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: or you might try to obtain and install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi <<< "$FIZZBIN_JSON" fi <<< "$FIZZBIN_JSON"
@@ -414,7 +414,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: cannot find an XPath JSON tool to use" 1>&2 echo "$0: ERROR: cannot find an XPath JSON tool to use" 1>&2
echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2 echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: otherwise install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
;; ;;
@@ -523,12 +523,12 @@ case "$XPATHJSON_USE" in
JSONPath.sh) JSONPath.sh)
if [[ $V_FLAG -ge 3 ]]; then if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: about to: $JSONPATH_SH -S -A -j -f $JSON_FILE > $TMP_JSON_FILE" 1>&2 echo "$0: debug[3]: about to: $JSONPATH_SH -S -4 -j -f $JSON_FILE > $TMP_JSON_FILE" 1>&2
fi fi
"$JSONPATH_SH" -S -A -j -f "$JSON_FILE" > "$TMP_JSON_FILE" "$JSONPATH_SH" -S -4 -j -f "$JSON_FILE" > "$TMP_JSON_FILE"
status="$?" status="$?"
if [[ $status -ne 0 ]]; then if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -S -A -j -f $JSON_FILE > $TMP_JSON_FILE failed," \ echo "$0: ERROR: $JSONPATH_SH -S -4 -j -f $JSON_FILE > $TMP_JSON_FILE failed," \
"error code: $status" 1>&2 "error code: $status" 1>&2
exit 1 exit 1
fi fi
bin/jprint-wrapper.sh
+14 -14
View File
@@ -128,7 +128,7 @@ export LC_ALL="C"
# set variables referenced in the usage message # set variables referenced in the usage message
# #
export VERSION="2.0.0 2025-03-13" export VERSION="2.0.1 2025-04-21"
NAME=$(basename "$0") NAME=$(basename "$0")
export NAME export NAME
export V_FLAG=0 export V_FLAG=0
@@ -359,7 +359,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: JSONPath.sh tool is not installed, is not executable, or not in \$PATH" 1>&2 echo "$0: ERROR: JSONPath.sh tool is not installed, is not executable, or not in \$PATH" 1>&2
echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2 echo "$0: notice: obtain jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: obtain JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: obtain JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi fi
@@ -367,12 +367,12 @@ case "$XPATHJSON_USE" in
# case: -Q - perform quick check # case: -Q - perform quick check
# #
if [[ -n $QUICK_CHECK ]]; then if [[ -n $QUICK_CHECK ]]; then
# verify JSONPath.sh supports -S -A -p # verify JSONPath.sh supports -S -4 -p
if ! "$JSONPATH_SH" -S -A -p >/dev/null 2>&1; then if ! "$JSONPATH_SH" -S -4 -p >/dev/null 2>&1; then
echo "$0: ERROR: JSONPath.sh tool does not support -S -A: $FIZZBIN_JSON" 1>&2 echo "$0: ERROR: JSONPath.sh tool does not support -S -4 -p: $FIZZBIN_JSON" 1>&2
echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2 echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: otherwise install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi <<< "$FIZZBIN_JSON" fi <<< "$FIZZBIN_JSON"
@@ -402,7 +402,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: jsp tool does not support --indent 4 --format --no-color: $FIZZBIN_JSON" 1>&2 echo "$0: ERROR: jsp tool does not support --indent 4 --format --no-color: $FIZZBIN_JSON" 1>&2
echo "$0: notice: you might need to update and reinstall jsp from: $JSP_REPO" 1>&2 echo "$0: notice: you might need to update and reinstall jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: or you might try to obtain and install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: or you might try to obtain and install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
fi <<< "$FIZZBIN_JSON" fi <<< "$FIZZBIN_JSON"
@@ -415,7 +415,7 @@ case "$XPATHJSON_USE" in
echo "$0: ERROR: cannot find an XPath JSON tool to use" 1>&2 echo "$0: ERROR: cannot find an XPath JSON tool to use" 1>&2
echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2 echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: otherwise install JSONPath.sh version 0.0.22 or later from: $JSONPATH_REPO" 1>&2
echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2 echo "$0: notice: if possible install jsp instead of JSONPath.sh as jsp is faster" 1>&2
exit 5 exit 5
;; ;;
@@ -533,12 +533,12 @@ case "$XPATHJSON_USE" in
# #
if [[ -z $JSON_FILE ]]; then if [[ -z $JSON_FILE ]]; then
if [[ $V_FLAG -ge 3 ]]; then if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: about to: $JSONPATH_SH -S -A -j" 1>&2 echo "$0: debug[3]: about to: $JSONPATH_SH -S -4 -j" 1>&2
fi fi
"$JSONPATH_SH" -S -A -j "$JSONPATH_SH" -S -4 -j
status="$?" status="$?"
if [[ $status -ne 0 ]]; then if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -S -A -j failed," \ echo "$0: ERROR: $JSONPATH_SH -S -4 -j failed," \
"error code: $status" 1>&2 "error code: $status" 1>&2
exit 1 exit 1
fi fi
@@ -547,12 +547,12 @@ case "$XPATHJSON_USE" in
# #
else else
if [[ $V_FLAG -ge 3 ]]; then if [[ $V_FLAG -ge 3 ]]; then
echo "$0: debug[3]: about to: $JSONPATH_SH -S -A -j -f $JSON_FILE" 1>&2 echo "$0: debug[3]: about to: $JSONPATH_SH -S -4 -j -f $JSON_FILE" 1>&2
fi fi
"$JSONPATH_SH" -S -A -j -f "$JSON_FILE" "$JSONPATH_SH" -S -4 -j -f "$JSON_FILE"
status="$?" status="$?"
if [[ $status -ne 0 ]]; then if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -S -A -j -f $JSON_FILE failed," \ echo "$0: ERROR: $JSONPATH_SH -S -4 -j -f $JSON_FILE failed," \
"error code: $status" 1>&2 "error code: $status" 1>&2
exit 1 exit 1
fi fi
bin/jval-wrapper.sh
+4 -4
View File
@@ -112,7 +112,7 @@ export LC_ALL="C"
# set variables referenced in the usage message # set variables referenced in the usage message
# #
export VERSION="2.0.0 2025-03-13" export VERSION="2.0.1 2025-04-21"
NAME=$(basename "$0") NAME=$(basename "$0")
export NAME export NAME
export V_FLAG=0 export V_FLAG=0
@@ -372,9 +372,9 @@ case "$XPATHJSON_USE" in
# case: -Q - perform quick check # case: -Q - perform quick check
# #
if [[ -n $QUICK_CHECK ]]; then if [[ -n $QUICK_CHECK ]]; then
# verify JSONPath.sh supports -S -A -p # verify JSONPath.sh supports -S -4 -p
if ! "$JSONPATH_SH" -S -A -p >/dev/null 2>&1; then if ! "$JSONPATH_SH" -S -4 -p >/dev/null 2>&1; then
echo "$0: ERROR: JSONPath.sh tool does not support -S -A: $FIZZBIN_JSON" 1>&2 echo "$0: ERROR: JSONPath.sh tool does not support -S -4 -p: $FIZZBIN_JSON" 1>&2
echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2 echo "$0: notice: we recommend you obtain and install jsp from: $JSP_REPO" 1>&2
echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2 echo "$0: notice: or obtain jsp via \"pipx install jsp\" and placing ~/.local/bin in \$PATH" 1>&2
echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2 echo "$0: notice: otherwise install JSONPath.sh from: $JSONPATH_REPO" 1>&2
sitemap.xml
+3 -3
View File
@@ -15274,15 +15274,15 @@
</url> </url>
<url> <url>
<loc>https://www.ioccc.org/bin/jfmt-wrapper.sh</loc> <loc>https://www.ioccc.org/bin/jfmt-wrapper.sh</loc>
<lastmod>2025-04-16T20:59:19+00:00</lastmod> <lastmod>2025-04-21T07:52:21+00:00</lastmod>
</url> </url>
<url> <url>
<loc>https://www.ioccc.org/bin/jprint-wrapper.sh</loc> <loc>https://www.ioccc.org/bin/jprint-wrapper.sh</loc>
<lastmod>2025-04-16T20:59:19+00:00</lastmod> <lastmod>2025-04-21T07:52:00+00:00</lastmod>
</url> </url>
<url> <url>
<loc>https://www.ioccc.org/bin/jval-wrapper.sh</loc> <loc>https://www.ioccc.org/bin/jval-wrapper.sh</loc>
<lastmod>2025-04-16T20:59:19+00:00</lastmod> <lastmod>2025-04-21T08:26:44+00:00</lastmod>
</url> </url>
<url> <url>
<loc>https://www.ioccc.org/bin/manifest.csv.entry.awk</loc> <loc>https://www.ioccc.org/bin/manifest.csv.entry.awk</loc>