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

fix pipe failed error messages

Browse Source 
We changed cases where the echo was `failed",` to `failed,"`.

This is a minor edit, no functionality was changed.
This commit is contained in:
Landon Curt Noll committed 2025-03-28 20:24:51 -07:00
1 parent cf50337255
commit 49068e4c5b
4 files changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/csv2entry.sh
+2 -2
View File
@@ -914,7 +914,7 @@ PATTERN='$..entry_id'
"$COMBINE_AUTHOR" | "$JVAL_WRAPPER" -b -q - "$PATTERN" | LC_ALL=C sort -t _ -d -u > "$TMP_AUTHOR_HANDLE_FROM_FILES"
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $COMBINE_AUTHOR | $JVAL_WRAPPER -b -q '$PATTERN' | sort ... failed", \
echo "$0: ERROR: $COMBINE_AUTHOR | $JVAL_WRAPPER -b -q '$PATTERN' | sort ... failed," \
"error codes: ${status_codes[*]}" 1>&2
EXIT_CODE="9" # exit 9
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
@@ -938,7 +938,7 @@ fi
sed -e '/^#/d' -e 's/^[^,]*,//' -e 's/,/\n/g' "$AUTHOR_WINS_CSV" | LC_ALL=C sort -t _ -d -u > "$TMP_AUTHOR_HANDLE_FROM_CSV"
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: sed -e ... | sort ... failed", \
echo "$0: ERROR: sed -e ... | sort ... failed," \
"error codes: ${status_codes[*]}" 1>&2
EXIT_CODE="9" # exit 9
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
bin/jfmt-wrapper.sh
+1 -1
View File
@@ -512,7 +512,7 @@ case "$XPATHJSON_USE" in
sed -e 's/\(\S\): /\1 : /' > "$TMP_JSON_FILE"
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color < $JSON_FILE | sed ... failed", \
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color < $JSON_FILE | sed ... failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
bin/jprint-wrapper.sh
+2 -2
View File
@@ -503,7 +503,7 @@ case "$XPATHJSON_USE" in
sed -e 's/\(\S\): /\1 : /'
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color | sed ... failed", \
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color | sed ... failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
@@ -518,7 +518,7 @@ case "$XPATHJSON_USE" in
sed -e 's/\(\S\): /\1 : /'
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color < $JSON_FILE | sed ... failed", \
echo "$0: ERROR: $JSP_TOOL --indent 4 --format --no-color < $JSON_FILE | sed ... failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
bin/jval-wrapper.sh
+16 -16
View File
@@ -520,7 +520,7 @@ jsp)
"$JSP_TOOL" --no-color --format --indent 0 -- "$PATTERN"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' failed", \
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -536,7 +536,7 @@ jsp)
"$JSP_TOOL" --no-color --format --indent 0 -- "$PATTERN" | tr -d '\n'
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' failed", \
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
@@ -556,7 +556,7 @@ jsp)
"$JSP_TOOL" --no-color --format --indent 0 -- "$PATTERN" < "$JSON_FILE"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' < $JSON_FILE failed", \
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' < $JSON_FILE failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -572,7 +572,7 @@ jsp)
"$JSP_TOOL" --no-color --format --indent 0 -- "$PATTERN" < "$JSON_FILE" | tr -d '\n'
status_codes=("${PIPESTATUS[@]}")
if [[ ${status_codes[*]} =~ [1-9] ]]; then
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' < $JSON_FILE failed", \
echo "$0: ERROR: $JSP_TOOL --no-color --format --indent 0 -- '$PATTERN' < $JSON_FILE failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
@@ -595,7 +595,7 @@ jsp)
-e '/^\[$/d'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jsp options: -q -b: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jsp options: -q -b: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -611,7 +611,7 @@ jsp)
-e '/^\[$/d'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jsp options: -b: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jsp options: -b: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -634,7 +634,7 @@ jsp)
-e '/\t\[$/d'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jsp options: -q: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jsp options: -q: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -649,7 +649,7 @@ jsp)
-e '/\t\[$/d'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jsp: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jsp: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -681,7 +681,7 @@ JSONPath.sh)
"$JSONPATH_SH" -w -u -- "$PATTERN"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -w -u -- '$PATTERN' failed", \
echo "$0: ERROR: $JSONPATH_SH -w -u -- '$PATTERN' failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -697,7 +697,7 @@ JSONPath.sh)
"$JSP_TOOL" --no-color --format --indent 0 -- "$PATTERN" | tr -d '\n'
status_codes=("${PIPESTATUS[@]}")
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -w -u -- '$PATTERN' failed", \
echo "$0: ERROR: $JSONPATH_SH -w -u -- '$PATTERN' failed," \
"error codes: ${status_codes[*]}" 1>&2
exit 1
fi
@@ -717,7 +717,7 @@ JSONPath.sh)
"$JSONPATH_SH" -w -u -f "$JSON_FILE" -- "$PATTERN"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -w -u -f $JSON_FILE -- '$PATTERN' failed", \
echo "$0: ERROR: $JSONPATH_SH -w -u -f $JSON_FILE -- '$PATTERN' failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -733,7 +733,7 @@ JSONPath.sh)
"$JSONPATH_SH" -w -u -f "$JSON_FILE" -- "$PATTERN" | tr -d '\n'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: $JSONPATH_SH -w -u -f $JSON_FILE -- '$PATTERN' failed", \
echo "$0: ERROR: $JSONPATH_SH -w -u -f $JSON_FILE -- '$PATTERN' failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -754,7 +754,7 @@ JSONPath.sh)
-e 's/"$//'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jJSONPath.sh options: -q -b: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jJSONPath.sh options: -q -b: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -766,7 +766,7 @@ JSONPath.sh)
sed -E -e 's/^\S*\s*//'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t jJSONPath.sh options: -b: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t jJSONPath.sh options: -b: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -789,7 +789,7 @@ JSONPath.sh)
-e 's/"$//'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t JSONPath.sh options: -q: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t JSONPath.sh options: -q: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi
@@ -802,7 +802,7 @@ JSONPath.sh)
-e 's/\s+$//'
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pipe from -t JSONPath.sh: sed -E -e ... failed", \
echo "$0: ERROR: pipe from -t JSONPath.sh: sed -E -e ... failed," \
"error code: $status" 1>&2
exit 1
fi