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
+3
-23
@@ -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
|
||||
|
||||
Reference in new issue
Block a user