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.
This commit is contained in:
1 parent
1732c368ed
commit
86d5c8808e
28 files changed
+97
-259
No files matched your search
+4
-10
@@ -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")
|
||||
|
||||
Reference in new issue
Block a user