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

correctly process non-zero EXIT_CODE, fix 2020/endoh2/README.md

Browse Source 
We found cases where pandoc reported a conversion from markdown to
HTML problem that, while reported by the `bin/pandoc-wrapper.sh`
to `bin/md2html.sh`, which in turn reported to error to the tool
calling it, the tool calling `bin/md2html.sh` set `$EXIT_CODE` to
a non-zero value in order to delay the abort but then failed to act
on the non-zero `$EXIT_CODE` value at the end.

In a number of cases when `$EXIT_CODE` was set to non-zero, the
stderr message was labeled as a "Warning" instead of an "ERROR".

Fixed a bug in `bin/gen-authors.sh` that resulted the generation
of invalid markdown/HTML.  An `<hr>` HTML tag inside a `<div>` span
caused pandoc to issue "Div at .. closing implicitly" at the _hr_
HTML tag line.  For some reason, one cannot place a `<hr>`
(horizontal line) inside a `<div ... /div>` span.

Fixed a broken markdown links in `2020/endoh2/README.md` whose error
was hidden by one of the above mentioned problems.

Changed `bin/gen-authors.sh` VERSION from "1.10.1 2024-05-07"
to "1.10.2 2024-05-19" as a result of the above changes.

Changed `bin/gen-location.sh` VERSION from "1.4.1 2024-04-28"
to "1.4.2 2024-05-19" as a result of the above changes.

Changed `bin/gen-top-html.sh` VERSION from "1.4.6 2024-05-05"
to "1.4.5 2024-05-19" as a result of the above changes.

Changed `bin/gen-years.sh` VERSION from "1.3.1 2024-04-28"
to "1.3.2 2024-05-19" as a result of the above changes.

Changed `bin/quick-readme2index.sh` VERSION from "1.1.4 2024-04-13"
to "1.1.5 2024-05-19" as a result of the above changes.

Changed `bin/readme2index.sh` VERSION from "1.2.4 2024-04-14"
to "1.2.5 2024-05-19" as a result of the above changes.

Performed `make www` to test the above under macOS.
This commit is contained in:
Landon Curt Noll committed 2024-05-19 14:15:31 -07:00
1 parent f484d0a045
commit 69c38e0a48
10 files changed
+74 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bin/gen-authors.sh
+7 -4
View File
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.10.1 2024-05-07"
export VERSION="1.10.2 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -1141,9 +1141,9 @@ EOF
fi
echo "<div id=\"$l\">"
echo "## ${IS_FOR[$l]}"
echo '<hr style="width:10%;text-align:left;margin-left:0">'
echo "<!-- $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l $l -->"
echo "</div>"
echo '<hr style="width:10%;text-align:left;margin-left:0">'
echo
# case: we have a "sort_word file" line
@@ -1358,7 +1358,7 @@ if [[ -z $NOOP ]]; then
"$MD2HTML_SH" "${TOOL_OPTION[@]}" -- authors.md "$TMP_AUTHORS_MD" "$AUTHORS_HTML"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -- authors.md $TMP_AUTHORS_MD $AUTHORS_HTML" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -- authors.md $TMP_AUTHORS_MD $AUTHORS_HTML" \
"failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
@@ -1382,4 +1382,7 @@ fi
# All Done!!! -- Jessica Noll, Age 2
#
exit 0
if [[ $EXIT_CODE -ne 0 ]]; then
echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
fi
exit "$EXIT_CODE"
bin/gen-location.sh
+5 -2
View File
@@ -84,7 +84,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.4.1 2024-04-28"
export VERSION="1.4.2 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -602,4 +602,7 @@ fi
# All Done!!! -- Jessica Noll, Age 2
#
exit 0
if [[ $EXIT_CODE -ne 0 ]]; then
echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
fi
exit "$EXIT_CODE"
bin/gen-top-html.sh
+14 -11
View File
@@ -93,7 +93,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.4.6 2024-05-05"
export VERSION="1.4.5 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -476,25 +476,25 @@ if (( ${#TOP_MD_SELECT_SET[@]} )); then
#
export MD_FILE="$name.md"
if [[ ! -e $MD_FILE ]]; then
echo "$0: Warning: markdown file does not exist: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file does not exist: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -f $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a regular file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a regular file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -r $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a readable file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a readable file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -s $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a non-empty readable file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a non-empty readable file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
@@ -528,7 +528,7 @@ if (( ${#TOP_MD_SELECT_SET[@]} )); then
-m "$MD_FILE" -- "$MD_FILE" "$HTML_FILE"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH -U $SITE_URL/$HTML_FILE ${TOOL_OPTION[*]}" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH -U $SITE_URL/$HTML_FILE ${TOOL_OPTION[*]}" \
"-m $MD_FILE -- $MD_FILE $HTML_FILE" \
"failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
@@ -551,25 +551,25 @@ else
#
export MD_FILE="$name.md"
if [[ ! -e $MD_FILE ]]; then
echo "$0: Warning: markdown file does not exist: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file does not exist: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -f $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a regular file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a regular file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -r $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a readable file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a readable file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
fi
if [[ ! -s $MD_FILE ]]; then
echo "$0: Warning: markdown file is not a non-empty readable file: $MD_FILE" 1>&2
echo "$0: ERROR: markdown file is not a non-empty readable file: $MD_FILE" 1>&2
EXIT_CODE=8 # exit 8
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
continue
@@ -603,7 +603,7 @@ else
-m "$MD_FILE" -- "$MD_FILE" "$HTML_FILE"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH -U $SITE_URL/$HTML_FILE ${TOOL_OPTION[*]}" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH -U $SITE_URL/$HTML_FILE ${TOOL_OPTION[*]}" \
"-m $MD_FILE -- $MD_FILE $HTML_FILE" \
"failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
@@ -623,4 +623,7 @@ fi
# All Done!!! -- Jessica Noll, Age 2
#
if [[ $EXIT_CODE -ne 0 ]]; then
echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
fi
exit "$EXIT_CODE"
bin/gen-years.sh
+6 -3
View File
@@ -83,7 +83,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.3.1 2024-04-28"
export VERSION="1.3.2 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -858,7 +858,7 @@ if [[ -z $NOOP ]]; then
"$MD2HTML_SH" "${TOOL_OPTION[@]}" -- years.md "$TMP_YEARS_MD" "$YEARS_HTML"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -- years.md $TMP_YEARS_MD $YEARS_HTML" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -- years.md $TMP_YEARS_MD $YEARS_HTML" \
"failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
@@ -882,4 +882,7 @@ fi
# All Done!!! -- Jessica Noll, Age 2
#
exit 0
if [[ $EXIT_CODE -ne 0 ]]; then
echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
fi
exit "$EXIT_CODE"
bin/pandoc-wrapper.sh
+4
View File
@@ -413,6 +413,10 @@ else
fi
if [[ $status -ne 0 ]]; then
echo "$0: ERROR: pandoc: $PANDOC_TOOL exited non-zero: $status" 1>&2
cp -f "$MARKDOWN_INPUT" XXX # XXX
if [[ -n $NOOP ]]; then
cp -f "$HTML_OUTPUT" YYY # XXX
fi
exit 1
fi
bin/quick-readme2index.sh
+6 -3
View File
@@ -92,7 +92,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.1.4 2024-04-13"
export VERSION="1.1.5 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -549,7 +549,7 @@ if [[ -z $NOOP ]]; then
"$README_PATH" "$INDEX_PATH"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -m $README_PATH --" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -m $README_PATH --" \
"$README_PATH $INDEX_PATH failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2
@@ -580,4 +580,7 @@ fi
# All Done!!! -- Jessica Noll, Age 2
#
exit 0
if [[ $EXIT_CODE -ne 0 ]]; then
echo "$0: Warning: about to exit $EXIT_CODE" 1>&2
fi
exit "$EXIT_CODE"
bin/readme2index.sh
+2 -2
View File
@@ -86,7 +86,7 @@ shopt -s globstar # enable ** to match all files and zero or more directories an
# set variables referenced in the usage message
#
export VERSION="1.2.4 2024-04-14"
export VERSION="1.2.5 2024-05-19"
NAME=$(basename "$0")
export NAME
export V_FLAG=0
@@ -512,7 +512,7 @@ if [[ -z $NOOP ]]; then
"$README_PATH" "$INDEX_PATH"
status="$?"
if [[ $status -ne 0 ]]; then
echo "$0: Warning: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -m $README_PATH --" \
echo "$0: ERROR: md2html.sh: $MD2HTML_SH ${TOOL_OPTION[*]} -m $README_PATH --" \
"$README_PATH $INDEX_PATH failed, error: $status" 1>&2
EXIT_CODE="1" # exit 1
echo "$0: Warning: EXIT_CODE set to: $EXIT_CODE" 1>&2