Merge pull request #2426 from xexyl/bug-fix-output-year-index

bin/gen-status.sh

@@ -212,7 +212,7 @@ function output_modtime
 
 # output_status_json
 #
-# write an status.json file to standard output (stdout)
+# write a status.json file to standard output (stdout)
 #
 # usage:
 #	output_status_json contest_status news.md status.json
@@ -261,19 +261,19 @@ function output_status_json
     fi
     STATUS_PATH="$3"
     if [[ ! -e $STATUS_PATH ]]; then
-	echo "$0: ERROR: in output_status_json: status.json.html arg does not exist: $STATUS_PATH" 1>&2
+	echo "$0: ERROR: in output_status_json: status.json arg does not exist: $STATUS_PATH" 1>&2
 	return 6
     fi
     if [[ ! -f $STATUS_PATH ]]; then
-	echo "$0: ERROR: in output_status_json: status.json.html arg is not a file: $STATUS_PATH" 1>&2
+	echo "$0: ERROR: in output_status_json: status.json arg is not a file: $STATUS_PATH" 1>&2
 	return 7
     fi
     if [[ ! -r $STATUS_PATH ]]; then
-	echo "$0: ERROR: in output_status_json: status.json.html arg is not a readable file: $STATUS_PATH" 1>&2
+	echo "$0: ERROR: in output_status_json: status.json arg is not a readable file: $STATUS_PATH" 1>&2
 	return 8
     fi
 
-    # obtain news.md.html file modification date
+    # obtain news.md file modification date
     #
     NEWS_MD_MOD_DATE=$(output_modtime "$NEWS_MD_PATH")
     status="$?"

bin/output-year-index.sh

@@ -127,6 +127,7 @@ export TOPDIR
 export DOCROOT_SLASH="../../"
 export REPO_URL="https://github.com/ioccc-src/temp-test-ioccc/blob/master"
 export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc"
+export PANDOC_WRAPPER="bin/pandoc-wrapper.sh"
 
 # set usage message
 #

bin/status2html.sh

@@ -432,7 +432,7 @@ esac
 	echo "Comments and suggestions on these preliminary items are welcome, see [FAQ 0.5](faq.html#feedback)" \
 	     "for information on how."
 	;;
-    open) echo "# The IOCCC open for submissions"
+    open) echo "# The IOCCC is open for submissions"
 	echo
 	echo "See the [IOCCC news](news.html) page for possible updates to rules, guidelines, tools and deadlines."
 	echo
@@ -463,12 +463,12 @@ esac
 	echo "The IOCCC status is an unexpected status value: $CONTEST_STATUS"
         echo
         echo "This is a **BUG**, not a feature.  Feel free to report it!" 1>&2
-		echo "See the [GitHub issues page](https://github.com/ioccc-src/temp-test-ioccc/issues/new/choose}." 1>&2
+		echo "See the [GitHub issues page](https://github.com/ioccc-src/temp-test-ioccc/issues/new/choose)." 1>&2
 	;;
     esac
     echo
 
-    # write status.json content
+    # write status.json content to status.html
     #
     echo '# status.json'
     echo '```'