From 86d5c8808e018ef041b91bc880de3a8d5ccdb0f8 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Mon, 5 Aug 2024 01:06:35 -0700 Subject: [PATCH] remove use of -u repo_top_url in bin tools We have removed `-u repo_top_url` from tools. When it comes time to perform the **Great Fork Merge**, we will have to modify the `$REPO_TOP_URL` variable default, so `-u repo_top_url` won't help with the transition. Changed `bin/all-run.sh` VERSION from "1.3.5 2024-07-28" to "1.3.6 2024-08-05". Changed `bin/all-years.sh` VERSION from "1.0.4 2024-07-28" to "1.0.5 2024-08-05". Changed `bin/chk-entry.sh` VERSION from to "1.1.9 2024-07-28" to "1.1.10 2024-08-05". Changed `bin/gen-authors.sh` VERSION from "1.10.6 2024-07-28" to "1.10.7 2024-08-05". Changed `bin/gen-location.sh` VERSION from "1.4.4 2024-07-28" to "1.4.5 2024-08-05". Changed `bin/gen-other-html.sh` VERSION from "1.2.5 2024-07-28" to "1.2.6 2024-08-05". Changed `bin/gen-sitemap.sh` VERSION from "1.3.12 2024-07-28" to "1.3.13 2024-08-05". Changed `bin/gen-status.sh` VERSION from "1.5.7 2024-07-28" to "1.5.8 2024-08-05". Changed `bin/gen-top-html.sh` VERSION from "1.4.7 2024-07-28" to "1.4.8 2024-08-05". Changed `bin/gen-year-index.sh` VERSION from "1.1.1 2024-07-28" to "1.1.2 2024-08-05". Changed `bin/gen-years.sh` VERSION from "1.3.6 2024-07-28" to "1.3.7 2024-08-05". Changed `jfmt-wrapper.sh` VERSION from "1.3.7 2024-08-05" to "1.0.1 2024-08-05". Changed `bin/jprint-wrapper.sh` VERSION from "1.0 2024-07-28" to "1.0.1 2024-08-05". Changed `bin/md2html.sh` VERSION from "1.5.4 2024-07-28" to "1.5.5 2024-08-05". Changed `bin/output-index-author.sh` VERSION from "1.7.2 2024-07-28" to "1.7.3 2024-08-05". Changed `bin/output-index-inventory.sh` VERSION from "1.4.2 2024-07-28" to "1.4.3 2024-08-05". Changed `bin/output-year-index.sh` VERSION from "1.4.3 2024-07-28" to "1.4.4 2024-08-05". Changed `bin/pandoc-wrapper.sh` VERSION from "1.7.1 2024-07-28" to "1.7.2 2024-08-05". Changed `bin/quick-readme2index.sh` VERSION from "1.1.6 2024-07-28" to "1.1.7 2024-08-05". Changed `bin/readme2index.sh` VERSION from "1.2.6 2024-07-28" to "1.2.7 2024-08-05". Changed `bin/status2html.sh` VERSION from "1.4.2 2024-07-28" to "1.4.3 2024-08-05". Changed `bin/subst.default.sh` VERSION from "1.3.1 2024-07-28" to "1.3.2 2024-08-05". Changed `bin/subst.entry-index.sh` VERSION from "1.3.4 2024-07-28" to "1.3.5 2024-08-05". Changed `bin/subst.year-index.sh` VERSION from "1.1.4 2024-07-28" to "1.1.5 2024-08-05". Changed `bin/tar-entry.sh` VERSION from "1.3.9 2024-07-28" to "1.3.10 2024-08-05". Changed `bin/tar-year.sh` VERSION from "1.2.7 2024-07-28" to "1.2.8 2024-08-05". Changed `bin/untar-year.sh` VERSION from "1.0.3 2024-07-28" to "1.0.4 2024-08-05". Changed `bin/untar-entry.sh` VERSION from "1.0.3 2024-07-28" to "1.0.4 2024-08-05". Performed `make www` to accomplish the above and to test under macOS. --- bin/all-run.sh | 19 ++++++------------- bin/all-years.sh | 19 ++++++------------- bin/chk-entry.sh | 8 +++----- bin/gen-authors.sh | 14 ++++---------- bin/gen-location.sh | 14 ++++---------- bin/gen-other-html.sh | 17 ++++------------- bin/gen-sitemap.sh | 12 +++--------- bin/gen-status.sh | 14 ++++---------- bin/gen-top-html.sh | 14 ++++---------- bin/gen-year-index.sh | 12 +++--------- bin/gen-years.sh | 14 ++++---------- bin/jfmt-wrapper.sh | 26 +++----------------------- bin/jprint-wrapper.sh | 6 ++---- bin/md2html.sh | 18 +++--------------- bin/output-index-author.sh | 11 +++-------- bin/output-index-inventory.sh | 11 +++-------- bin/output-year-index.sh | 11 +++-------- bin/pandoc-wrapper.sh | 12 +++--------- bin/quick-readme2index.sh | 14 ++++---------- bin/readme2index.sh | 14 ++++---------- bin/status2html.sh | 11 +++-------- bin/subst.default.sh | 11 +++-------- bin/subst.entry-index.sh | 11 +++-------- bin/subst.year-index.sh | 11 +++-------- bin/tar-entry.sh | 8 +++----- bin/tar-year.sh | 8 +++----- bin/untar-entry.sh | 8 +++----- bin/untar-year.sh | 8 +++----- 28 files changed, 97 insertions(+), 259 deletions(-) diff --git a/bin/all-run.sh b/bin/all-run.sh index b29fa2fe9..a69808e49 100755 --- a/bin/all-run.sh +++ b/bin/all-run.sh @@ -17,7 +17,7 @@ # # Each tool run with command line of the form: # -# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_top_url, -w site_url] [more_options] YYYY/dir +# tool [any -D, -t tagline, -T md2html.sh, -p tool, -w site_url] [more_options] YYYY/dir # # For example: # @@ -27,7 +27,7 @@ # # bin/quick-readme2html.sh -t readme2html -w https://www.ioccc.org YYYY/dir -v 1 # -# Only the "-D -t, -T, -p, -u, -w" option set are passed to the tool command line. +# Only the "-D -t, -T, -p, -w" option set are passed to the tool command line. # For all other special tool options, pass them as additional tool options (i.e., command line arguments # that follow the 1st command line argument) OR consider simply running the tool directly. # @@ -113,7 +113,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.5 2024-07-28" +export VERSION="1.3.6 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -150,7 +150,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url] + [-t tagline] [-T md2html.sh] [-p tool] [-w site_url] tool [more_options] -h print help message and exit @@ -172,16 +172,13 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. - -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. tool the tool to run over all entries [more_options] additional tool command line options to use before the YYYY/dir argument -NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url' +NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-w site_url' are passed to the 'tool' at the beginning of the command line, and before any optional 'more_options' and before the final YYYY/dir argument. @@ -200,7 +197,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -257,10 +254,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/all-years.sh b/bin/all-years.sh index a5a6eecd8..c202a65b4 100755 --- a/bin/all-years.sh +++ b/bin/all-years.sh @@ -16,7 +16,7 @@ # # Each tool run with command line of the form: # -# tool [any -D, -t tagline, -T md2html.sh, -p tool, -u repo_top_url, -w site_url] [more_options] YYYY +# tool [any -D, -t tagline, -T md2html.sh, -p tool, -w site_url] [more_options] YYYY # # For example: # @@ -26,7 +26,7 @@ # # bin/gen-year-index.sh -w https://www.ioccc.org YYYY -v 1 # -# Only the "-D -t, -T, -p, -u, -w" option set are passed to the tool command line. +# Only the "-D -t, -T, -p, -w" option set are passed to the tool command line. # For all other special tool options, pass them as additional tool options (i.e., command line arguments # that follow the 1st command line argument) OR consider simply running the tool directly. # @@ -111,7 +111,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.0.4 2024-07-28" +export VERSION="1.0.5 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -148,7 +148,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url] + [-t tagline] [-T md2html.sh] [-p tool] [-w site_url] tool [more_options] -h print help message and exit @@ -171,16 +171,13 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. - -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. tool the tool to run over all entries [more_options] additional tool command line options to use before the YYYY/dir argument -NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url' +NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-w site_url' are passed to the 'tool' at the beginning of the command line, and before any optional 'more_options' and before the final YYYY/dir argument. @@ -199,7 +196,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -256,10 +253,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/chk-entry.sh b/bin/chk-entry.sh index 67ffd2385..c69e4402a 100755 --- a/bin/chk-entry.sh +++ b/bin/chk-entry.sh @@ -85,7 +85,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.9 2024-07-28" +export VERSION="1.1.10 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -108,7 +108,7 @@ export REPO_URL="$REPO_TOP_URL/blob/master" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-w site_url] + [-p tool] [-w site_url] YYYY/dir -h print help message and exit @@ -123,7 +123,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool This option is ignored - -u repo_top_url This option is ignored -w site_url This option is ignored YYYY/dir path from topdir to entry directory: must contain the files: README.md, .path and .entry.json @@ -149,7 +148,7 @@ export EXIT_CODE="0" # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w: flag; do +while getopts :hv:Vd:D:nNp:U:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -167,7 +166,6 @@ while getopts :hv:Vd:D:nNp:u:U:w: flag; do N) DO_NOT_PROCESS="-N" ;; p) ;; - u) ;; U) ;; w) ;; \?) echo "$0: ERROR: invalid option: -$OPTARG" 1>&2 diff --git a/bin/gen-authors.sh b/bin/gen-authors.sh index 142237625..efbabcf90 100755 --- a/bin/gen-authors.sh +++ b/bin/gen-authors.sh @@ -85,7 +85,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.6 2024-07-28" +export VERSION="1.10.7 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -153,7 +153,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] + [-t tagline] [-T md2html.sh] [-p tool] -h print help message and exit -v level set verbosity level (def level: 0) @@ -176,14 +176,12 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) NOTE: The '-p tool' is passed as leading options on tool command lines. - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -749,7 +747,7 @@ function output_affiliation # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -806,10 +804,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-location.sh b/bin/gen-location.sh index d541d2e65..e943e4e48 100755 --- a/bin/gen-location.sh +++ b/bin/gen-location.sh @@ -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.4 2024-07-28" +export VERSION="1.4.5 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -121,7 +121,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] + [-t tagline] [-T md2html.sh] [-p tool] -h print help message and exit -v level set verbosity level (def level: 0) @@ -144,14 +144,12 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) NOTE: The '-p tool' is passed as leading options on tool command lines. - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -169,7 +167,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -226,10 +224,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-other-html.sh b/bin/gen-other-html.sh index ec42169b5..0eaa727e4 100755 --- a/bin/gen-other-html.sh +++ b/bin/gen-other-html.sh @@ -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.2.5 2024-07-28" +export VERSION="1.2.6 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -121,7 +121,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url] + [-t tagline] [-T md2html.sh] [-p tool] [-w site_url] -h print help message and exit -v level set verbosity level (def level: 0) @@ -142,13 +142,10 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. - -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. -NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url' +NOTE: Any '-D docroot/', '-t tagline', '-T md2html.sh', '-p tool', '-w site_url' are passed to the 'tool' at the beginning of the command line, and before any optional 'more_options' and before the final YYYY/dir argument. @@ -168,7 +165,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -223,10 +220,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; w) SITE_URL="$OPTARG" ;; \?) echo "$0: ERROR: invalid option: -$OPTARG" 1>&2 @@ -343,8 +336,6 @@ fi # TOOL_OPTION+=("-t") TOOL_OPTION+=("$TAGLINE") -TOOL_OPTION+=("-u") -TOOL_OPTION+=("$REPO_TOP_URL") TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-sitemap.sh b/bin/gen-sitemap.sh index 6389bd896..14483f8bc 100755 --- a/bin/gen-sitemap.sh +++ b/bin/gen-sitemap.sh @@ -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.3.12 2024-07-28" +export VERSION="1.3.13 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -197,7 +197,7 @@ function output_modtime # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-u repo_top_url] [-w site_url] [-W] + [-w site_url] [-W] -h print help message and exit -v level set verbosity level (def level: 0) @@ -208,8 +208,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -n go thru the actions, but do not update any files (def: do the action) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. @@ -238,7 +236,7 @@ export EXIT_CODE="0" # parse command line # -while getopts :hv:Vd:nNu:w:W flag; do +while getopts :hv:Vd:nNw:W flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -254,10 +252,6 @@ while getopts :hv:Vd:nNu:w:W flag; do ;; N) DO_NOT_PROCESS="-N" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; w) SITE_URL="$OPTARG" ;; W) CAP_W_FLAG_FOUND="true" diff --git a/bin/gen-status.sh b/bin/gen-status.sh index 96824dfdc..8e89fcb51 100755 --- a/bin/gen-status.sh +++ b/bin/gen-status.sh @@ -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.5.7 2024-07-28" +export VERSION="1.5.8 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -336,7 +336,7 @@ function output_status_json # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-t tagline] [-T md2html.sh] [-u repo_top_url] + [-t tagline] [-T md2html.sh] [p | pending | o | open | j | judging | c | closed] -h print help message and exit @@ -357,8 +357,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] NOTE: 'tagline' may be enclosed within, but may NOT contain an internal single-quote, or double-quote. -T md2html.sh run 'markdown to html tool' to convert markdown into HTML (def: $MD2HTML_SH) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. @@ -370,7 +368,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -387,7 +385,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -440,10 +438,6 @@ while getopts :hv:Vd:D:nNt:T:u:w: flag; do TOOL_OPTION+=("-T") TOOL_OPTION+=("$MD2HTML_SH") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-top-html.sh b/bin/gen-top-html.sh index 591be5882..cc53f044b 100755 --- a/bin/gen-top-html.sh +++ b/bin/gen-top-html.sh @@ -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.7 2024-07-28" +export VERSION="1.4.8 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -154,7 +154,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [file...] + [-t tagline] [-T md2html.sh] [-p tool] [file...] -h print help message and exit -v level set verbosity level (def level: 0) @@ -177,14 +177,12 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) NOTE: The '-p tool' is passed as leading options on tool command lines. - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -202,7 +200,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -259,10 +257,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-year-index.sh b/bin/gen-year-index.sh index c8a5656f5..552d36298 100755 --- a/bin/gen-year-index.sh +++ b/bin/gen-year-index.sh @@ -85,7 +85,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.1 2024-07-28" +export VERSION="1.1.2 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -117,7 +117,7 @@ declare -ag TOOL_OPTION # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-t tagline] [-T md2html.sh] [-u repo_top_url] [-w site_url] + [-t tagline] [-T md2html.sh] [-w site_url] YYYY [more_options] -h print help message and exit @@ -134,8 +134,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -t tagline string to write about the tool that formed the markdown content (def: $TAGLINE) -T md2html.sh run 'markdown to html tool' to convert markdown into HTML (def: $MD2HTML_SH) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. @@ -162,7 +160,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNt:T:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -214,10 +212,6 @@ while getopts :hv:Vd:D:nNt:T:u:w: flag; do TOOL_OPTION+=("-T") TOOL_OPTION+=("$MD2HTML_SH") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/gen-years.sh b/bin/gen-years.sh index a5778eb2c..ef3940ec4 100755 --- a/bin/gen-years.sh +++ b/bin/gen-years.sh @@ -85,7 +85,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.6 2024-07-28" +export VERSION="1.3.7 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -134,7 +134,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] + [-t tagline] [-T md2html.sh] [-p tool] -h print help message and exit -v level set verbosity level (def level: 0) @@ -157,14 +157,12 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) NOTE: The '-p tool' is passed as leading options on tool command lines. - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -296,7 +294,7 @@ function output_ordinal # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -353,10 +351,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/jfmt-wrapper.sh b/bin/jfmt-wrapper.sh index 14b3f6006..1488e3f9f 100755 --- a/bin/jfmt-wrapper.sh +++ b/bin/jfmt-wrapper.sh @@ -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.0 2024-07-28" +export VERSION="1.0.1 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -140,24 +140,9 @@ if ! "$JSONPATH_SH" -S -A -T -p >/dev/null 2>&1; then fi <<< "$FIZZBIN_JSON" -# verify jparse tool -# -if [[ -z "$JPARSE_TOOL" ]]; then - echo "$0: ERROR: cannot find an executable jparse tool" 1>&2 - exit 5 -fi -if [[ ! -f "$JPARSE_TOOL" ]]; then - echo "$0: ERROR: jparse is not a file: $JPARSE_TOOL" 1>&2 - exit 5 -fi -if [[ ! -x "$JPARSE_TOOL" ]]; then - echo "$0: ERROR: jparse is not an executable file: $JPARSE_TOOL" 1>&2 - exit 5 -fi - # set usage message # -export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-u repo_top_url] [-j JSONPath.sh] [-J jparse] file.json +export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-j JSONPath.sh] file.json -h print help message and exit -v level set verbosity level (def level: 0) @@ -166,10 +151,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-u repo_top_url] [-j JSO -n do not modify file.json (def: modify file.json is not canonical) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - -j JSONPath.sh path to the JSONPath.sh tool (not the wrapper) (def: $JSONPATH_SH) - -J jparse path to the jparse tool (def: $JPARSE_TOOL) file.json The JSON file to write, in canonical form, to stdout (def: read stdin) @@ -193,7 +175,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:VnNj:J: flag; do +while getopts :hv:VnNj: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -209,8 +191,6 @@ while getopts :hv:VnNj:J: flag; do ;; j) JSONPATH_SH="$OPTARG" ;; - J) JPARSE_TOOL="$OPTARG" - ;; \?) echo "$0: ERROR: invalid option: -$OPTARG" 1>&2 echo 1>&2 echo "$USAGE" 1>&2 diff --git a/bin/jprint-wrapper.sh b/bin/jprint-wrapper.sh index c58b4eb81..73187288a 100755 --- a/bin/jprint-wrapper.sh +++ b/bin/jprint-wrapper.sh @@ -89,7 +89,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.0 2024-07-28" +export VERSION="1.0.1 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -138,7 +138,7 @@ fi <<< "$FIZZBIN_JSON" # set usage message # -export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-u repo_top_url] [-j JSONPath.sh] [file.json] +export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-j JSONPath.sh] [file.json] -h print help message and exit -v level set verbosity level (def level: 0) @@ -147,8 +147,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-n] [-N] [-u repo_top_url] [-j JSO -n do nothing (same as -N) (def: do the action) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - -j JSONPath.sh path to the JSONPath.sh tool (not the wrapper) (def: $JSONPATH_SH) file.json The JSON file to write, in canonical form, to stdout (def: read stdin) diff --git a/bin/md2html.sh b/bin/md2html.sh index e90fe48ae..2b87da20f 100755 --- a/bin/md2html.sh +++ b/bin/md2html.sh @@ -141,7 +141,7 @@ shopt -s lastpipe # run last command of a pipeline not executed in the backgroun # set variables referenced in the usage message # -export VERSION="1.5.4 2024-07-28" +export VERSION="1.5.5 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -177,7 +177,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] [-c md2html.cfg] [-H phase=name ..] [-t tagline] [-b tool] [-p tool] [-a tool] [-s token=value ..] [-S] [-o tool ..] - [-u repo_top_url] [-U url] [-w site_url] [-m mdtag] [-e string ..] [-E exitcode] + [-U url] [-w site_url] [-m mdtag] [-e string ..] [-E exitcode] [match.md] input.md output.html -h print help message and exit @@ -226,8 +226,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -o . disable use of 'output tool' (def: do not use an 'output tool') NOTE: -o may only be used in command_options and md2html.cfg cfg_options (getopt phases 0 and 2) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on -b tool, -a tool, and -o tool command lines. -U url URL of HTML being formed (def: $URL) NOTE: The '-U url' is passed as leading options on -b tool, -a tool, and -o tool command lines. -w site_url Base URL of the website (def: $SITE_URL) @@ -414,7 +412,7 @@ function parse_command_line # parse command line # - while getopts :hv:VnNd:D:c:H:t:m:b:p:a:s:So:u:U:w:e:E: flag; do + while getopts :hv:VnNd:D:c:H:t:m:b:p:a:s:So:U:w:e:E: flag; do case "$flag" in h) print_usage 1>&2 exit 2 @@ -640,16 +638,6 @@ function parse_command_line # OUTPUT_TOOL+=("$OPTARG") ;; - u) REPO_TOP_URL="$OPTARG" - B_OPTION+=("-u") - B_OPTION+=("$REPO_TOP_URL") - P_OPTION+=("-u") - P_OPTION+=("$REPO_TOP_URL") - A_OPTION+=("-u") - A_OPTION+=("$REPO_TOP_URL") - O_OPTION+=("-u") - O_OPTION+=("$REPO_TOP_URL") - ;; U) URL="$OPTARG" B_OPTION+=("-U") B_OPTION+=("$URL") diff --git a/bin/output-index-author.sh b/bin/output-index-author.sh index 0d93cc326..6f80cd446 100755 --- a/bin/output-index-author.sh +++ b/bin/output-index-author.sh @@ -101,7 +101,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.7.2 2024-07-28" +export VERSION="1.7.3 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -128,7 +128,7 @@ export URL="#" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode] + [-p tool] [-U url] [-w site_url] [-e string ..] [-E exitcode] YYYY/dir -h print help message and exit @@ -144,7 +144,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -374,7 +373,7 @@ function output_location_code # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNp:U:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -403,10 +402,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do ;; p) PANDOC_WRAPPER="$OPTARG" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/output-index-inventory.sh b/bin/output-index-inventory.sh index a12a3b5cb..bc23f84c2 100755 --- a/bin/output-index-inventory.sh +++ b/bin/output-index-inventory.sh @@ -101,7 +101,7 @@ shopt -s globstar # enable '**' to match all files and zero or more directories # set variables referenced in the usage message # -export VERSION="1.4.2 2024-07-28" +export VERSION="1.4.3 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -128,7 +128,7 @@ export URL="#" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode] + [-p tool] [-U url] [-w site_url] [-e string ..] [-E exitcode] YYYY/dir -h print help message and exit @@ -144,7 +144,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -172,7 +171,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNp:U:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -201,10 +200,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do ;; p) PANDOC_WRAPPER="$OPTARG" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/output-year-index.sh b/bin/output-year-index.sh index 1bae3a4c9..8e15b819e 100755 --- a/bin/output-year-index.sh +++ b/bin/output-year-index.sh @@ -110,7 +110,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.3 2024-07-28" +export VERSION="1.4.4 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -136,7 +136,7 @@ export PANDOC_WRAPPER="bin/pandoc-wrapper.sh" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-p tool] [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode] + [-p tool] [-U URL] [-w site_url] [-e string ..] [-E exitcode] YYYY [more_options] -h print help message and exit @@ -152,7 +152,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -296,7 +295,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNp:U:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -325,10 +324,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do ;; p) PANDOC_WRAPPER="$OPTARG" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/pandoc-wrapper.sh b/bin/pandoc-wrapper.sh index f634389b1..88280e0d1 100755 --- a/bin/pandoc-wrapper.sh +++ b/bin/pandoc-wrapper.sh @@ -99,7 +99,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.7.1 2024-07-28" +export VERSION="1.7.2 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -143,7 +143,7 @@ export REPO_URL="$REPO_TOP_URL/blob/master" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-p pandoc_tool] [-u repo_top_url] [-e string ..] [-E exitcode] + [-p pandoc_tool] [-e string ..] [-E exitcode] file.md output.html -h print help message and exit @@ -157,8 +157,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -p pandoc_tool path to the pandoc tool (not the wrapper) (def: $PANDOC_TOOL) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - -e string output string, followed by newline, to stderr (def: do not) -E exitcode force exit with exitcode (def: exit based on success or failure of the action) @@ -187,7 +185,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:nNp:u:e:E: flag; do +while getopts :hv:Vd:nNp:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -205,10 +203,6 @@ while getopts :hv:Vd:nNp:u:e:E: flag; do ;; p) PANDOC_TOOL="$OPTARG" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; e) echo "$OPTARG" 1>&2 ;; E) exit "$OPTARG" diff --git a/bin/quick-readme2index.sh b/bin/quick-readme2index.sh index 3b5ad5b2e..637da192c 100755 --- a/bin/quick-readme2index.sh +++ b/bin/quick-readme2index.sh @@ -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.6 2024-07-28" +export VERSION="1.1.7 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -137,7 +137,7 @@ declare -ag TOOL_OPTION # usage # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-t tagline] [-T md2html.sh] [-p tool] [-u repo_top_url] [-w site_url] + [-t tagline] [-T md2html.sh] [-p tool] [-w site_url] tool [more_options] -h print help message and exit @@ -158,15 +158,13 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. tool the tool to run over all entries [more_options] additional tool command line options to use before the YYYY/dir argument -NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-u repo_top_url', '-w site_url' +NOTE: Any '-t tagline', '-T md2html.sh', '-p tool', '-w site_url' are passed to the 'tool' at the beginning of the command line, and before any optional 'more_options' and before the final YYYY/dir argument. @@ -185,7 +183,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -242,10 +240,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/readme2index.sh b/bin/readme2index.sh index 36e2c145f..229473d15 100755 --- a/bin/readme2index.sh +++ b/bin/readme2index.sh @@ -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.6 2024-07-28" +export VERSION="1.2.7 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -124,7 +124,7 @@ declare -ag TOOL_OPTION # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] [-t tagline] [-T md2html.sh] [-p tool] - [-u repo_top_url] [-w site_url] [-e string ..] [-E exitcode] + [-w site_url] [-e string ..] [-E exitcode] YYYY/dir -h print help message and exit @@ -149,8 +149,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p . skip HTML phase number 21 (def: do nothing during HTML phase number 21) NOTE: The '-p tool' will be passed as leading options on the -b tool and -a tool command lines. - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) - NOTE: The '-u repo_top_url' is passed as leading options on tool command lines. -w site_url Base URL of the website (def: $SITE_URL) NOTE: The '-w site_url' is passed as leading options on tool command lines. @@ -158,7 +156,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] NOTE: The '-v level' is passed as initial command line options to the 'markdown to html tool' (md2html.sh). The 'tagline' is passed as '-t tagline' to the 'markdown to html tool' (md2html.sh), after the '-v level'. - Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-u repo_top_url', '-U top_url' + Any '-T md2html.sh', '-p tool', '-P pandoc_opts', '-U top_url' are passed to the 'markdown to html tool' (md2html.sh), and will be before any command line arguments. Exit codes: @@ -176,7 +174,7 @@ $NAME version: $VERSION" # parse command line # -while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do +while getopts :hv:Vd:D:nNt:T:p:w: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -235,10 +233,6 @@ while getopts :hv:Vd:D:nNt:T:p:u:w: flag; do TOOL_OPTION+=("-p") TOOL_OPTION+=("$PANDOC_WRAPPER") ;; - u) REPO_TOP_URL="$OPTARG" - TOOL_OPTION+=("-u") - TOOL_OPTION+=("$REPO_TOP_URL") - ;; w) SITE_URL="$OPTARG" TOOL_OPTION+=("-w") TOOL_OPTION+=("$SITE_URL") diff --git a/bin/status2html.sh b/bin/status2html.sh index 92390b4da..9421d0373 100755 --- a/bin/status2html.sh +++ b/bin/status2html.sh @@ -101,7 +101,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.2 2024-07-28" +export VERSION="1.4.3 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -128,7 +128,7 @@ export URL="#" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode] + [-p tool] [-U url] [-w site_url] [-e string ..] [-E exitcode] -h print help message and exit -v level set verbosity level (def level: 0) @@ -143,7 +143,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -171,7 +170,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNp:U:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -200,10 +199,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:e:E: flag; do ;; p) PANDOC_WRAPPER="$OPTARG" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/subst.default.sh b/bin/subst.default.sh index 7228ad17d..03caaf9f5 100755 --- a/bin/subst.default.sh +++ b/bin/subst.default.sh @@ -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.3.1 2024-07-28" +export VERSION="1.3.2 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -118,7 +118,7 @@ export URL="#" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-u repo_top_url] [-U url] [-w site_url] [-e string ..] [-E exitcode] + [-U url] [-w site_url] [-e string ..] [-E exitcode] [ignored] -h print help message and exit @@ -132,7 +132,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -n go thru the actions, but do not update any files (def: do the action) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -159,7 +158,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNU:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -186,10 +185,6 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do ;; N) DO_NOT_PROCESS="-N" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/subst.entry-index.sh b/bin/subst.entry-index.sh index 00b5d6df8..15404bc2c 100755 --- a/bin/subst.entry-index.sh +++ b/bin/subst.entry-index.sh @@ -103,7 +103,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.4 2024-07-28" +export VERSION="1.3.5 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -128,7 +128,7 @@ export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode] + [-U URL] [-w site_url] [-e string ..] [-E exitcode] YYYY/dir -h print help message and exit @@ -142,7 +142,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -n go thru the actions, but do not update any files (def: do the action) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -222,7 +221,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNU:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -249,10 +248,6 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do ;; N) DO_NOT_PROCESS="-N" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/subst.year-index.sh b/bin/subst.year-index.sh index becdc2ff0..4a714a4dd 100755 --- a/bin/subst.year-index.sh +++ b/bin/subst.year-index.sh @@ -103,7 +103,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-07-28" +export VERSION="1.1.5 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -128,7 +128,7 @@ export SITE_URL="https://ioccc-src.github.io/temp-test-ioccc" # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] - [-u repo_top_url] [-U URL] [-w site_url] [-e string ..] [-E exitcode] + [-U URL] [-w site_url] [-e string ..] [-E exitcode] YYYY -h print help message and exit @@ -142,7 +142,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -n go thru the actions, but do not update any files (def: do the action) -N do not process file, just parse arguments and ignore the file (def: process the file) - -u repo_top_url Top level URL of target git repo (def: $REPO_TOP_URL) -U url URL of HTML file being formed (def: $URL) -w site_url Base URL of the website (def: $SITE_URL) @@ -232,7 +231,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do +while getopts :hv:Vd:D:nNU:w:e:E: flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -259,10 +258,6 @@ while getopts :hv:Vd:D:nNu:U:w:e:E: flag; do ;; N) DO_NOT_PROCESS="-N" ;; - u) REPO_TOP_URL="$OPTARG" - # GitHub puts individual files under the "blob/master" sub-directory. - export REPO_URL="$REPO_TOP_URL/blob/master" - ;; U) URL="$OPTARG" ;; w) SITE_URL="$OPTARG" diff --git a/bin/tar-entry.sh b/bin/tar-entry.sh index 0760e3304..b86052bd8 100755 --- a/bin/tar-entry.sh +++ b/bin/tar-entry.sh @@ -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.9 2024-07-28" +export VERSION="1.3.10 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -113,7 +113,7 @@ fi # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-w site_url] [-W] + [-p tool] [-w site_url] [-W] YYYY/dir -h print help message and exit @@ -128,7 +128,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool This option is ignored - -u repo_top_url This option is ignored -w site_url This option is ignored -W Warn if a file in the manifest is missing: (def: error if a file is missing) @@ -157,7 +156,7 @@ export EXIT_CODE="0" # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:W flag; do +while getopts :hv:Vd:D:nNp:U:w:W flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -175,7 +174,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:W flag; do N) DO_NOT_PROCESS="-N" ;; p) ;; - u) ;; U) ;; w) ;; W) CAP_W_FLAG_FOUND="true" diff --git a/bin/tar-year.sh b/bin/tar-year.sh index 62dd154da..03c52d49a 100755 --- a/bin/tar-year.sh +++ b/bin/tar-year.sh @@ -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.2.7 2024-07-28" +export VERSION="1.2.8 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -113,7 +113,7 @@ fi # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-w site_url] [-W] + [-p tool] [-w site_url] [-W] YYYY -h print help message and exit @@ -128,7 +128,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool This option is ignored - -u repo_top_url This option is ignored -w site_url This option is ignored -W Warn if a file in the manifest is missing: (def: error if a file is missing) @@ -157,7 +156,7 @@ export EXIT_CODE="0" # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:W flag; do +while getopts :hv:Vd:D:nNp:U:w:W flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -175,7 +174,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:W flag; do N) DO_NOT_PROCESS="-N" ;; p) ;; - u) ;; U) ;; w) ;; W) CAP_W_FLAG_FOUND="true" diff --git a/bin/untar-entry.sh b/bin/untar-entry.sh index 163034de4..bba93fcfa 100755 --- a/bin/untar-entry.sh +++ b/bin/untar-entry.sh @@ -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.0.3 2024-07-28" +export VERSION="1.0.4 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -113,7 +113,7 @@ fi # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-w site_url] [-W] + [-p tool] [-w site_url] [-W] YYYY/dir -h print help message and exit @@ -128,7 +128,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool This option is ignored - -u repo_top_url This option is ignored -w site_url This option is ignored -W Warn if a file in the manifest is missing: (def: error if a file is missing) @@ -156,7 +155,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:W flag; do +while getopts :hv:Vd:D:nNp:U:w:W flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -174,7 +173,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:W flag; do N) DO_NOT_PROCESS="-N" ;; p) ;; - u) ;; U) ;; w) ;; W) CAP_W_FLAG_FOUND="true" diff --git a/bin/untar-year.sh b/bin/untar-year.sh index 55ad7ead9..f89904b51 100755 --- a/bin/untar-year.sh +++ b/bin/untar-year.sh @@ -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.0.3 2024-07-28" +export VERSION="1.0.4 2024-08-05" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -113,7 +113,7 @@ fi # set usage message # export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] - [-p tool] [-u repo_top_url] [-w site_url] [-W] + [-p tool] [-w site_url] [-W] YYYY -h print help message and exit @@ -128,7 +128,6 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-D docroot/] [-n] [-N] -p tool This option is ignored - -u repo_top_url This option is ignored -w site_url This option is ignored -W Warn if a file in the manifest is missing: (def: error if a file is missing) @@ -156,7 +155,7 @@ export DO_NOT_PROCESS= # parse command line # -while getopts :hv:Vd:D:nNp:u:U:w:W flag; do +while getopts :hv:Vd:D:nNp:U:w:W flag; do case "$flag" in h) echo "$USAGE" 1>&2 exit 2 @@ -174,7 +173,6 @@ while getopts :hv:Vd:D:nNp:u:U:w:W flag; do N) DO_NOT_PROCESS="-N" ;; p) ;; - u) ;; U) ;; w) ;; W) CAP_W_FLAG_FOUND="true"