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
+6
-13
@@ -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")
|
||||
|
||||
Reference in new issue
Block a user