From f3e7c04c276f46e23da8a5e83d7420f2a641bfd7 Mon Sep 17 00:00:00 2001 From: Cody Boone Ferguson <53008573+xexyl@users.noreply.github.com> Date: Fri, 2 Feb 2024 12:48:40 -0800 Subject: [PATCH] Typo fixes in several bin/ files --- bin/all-run.sh | 2 +- bin/gen-author.sh | 4 ++-- bin/gen-inventory.sh | 4 ++-- bin/pandoc-wrapper.sh | 4 ++-- bin/quick-readme2index.sh | 4 ++-- bin/readme2index.sh | 16 ++++++++-------- bin/sort.gitignore | 4 ++-- bin/subst.default.sh | 2 +- bin/subst.winner-index.sh | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/bin/all-run.sh b/bin/all-run.sh index 2bee8e0e4..99d39c662 100755 --- a/bin/all-run.sh +++ b/bin/all-run.sh @@ -101,7 +101,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] NOTE: The '-p tool' is passed as leading options on tool command lines. -P pandoc_opts run 'pandoc wrapper tool' with options found in 'optstr' (def: $PANDOC_WRAPPER_OPTSTR) NOTE: The '-P pandoc_opts' is passed as leading options on tool command lines. - NOTE: The 'pandoc_opts' may not contain a single-quote, nor a double-quote. + NOTE: The 'pandoc_opts' may not contain a single-quote or a double-quote. -u repo_url Base level URL of target git repo (def: $REPO_URL) NOTE: The '-u repo_url' is passed as leading options on tool command lines. diff --git a/bin/gen-author.sh b/bin/gen-author.sh index 0546652cf..560afaff4 100755 --- a/bin/gen-author.sh +++ b/bin/gen-author.sh @@ -48,7 +48,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories @@ -93,7 +93,7 @@ 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) -P pandoc_opts run 'pandoc wrapper tool' with options found in 'optstr' (def: $PANDOC_WRAPPER_OPTSTR) - NOTE: The 'pandoc_opts' may not contain a single-quote, nor a double-quote. + NOTE: The 'pandoc_opts' may not contain a single-quote or a double-quote. -u repo_url Base level URL of target git repo (def: $REPO_URL) -U top_url Top level URL of web site where HTML files will be viewed (def: $TOP_URL) diff --git a/bin/gen-inventory.sh b/bin/gen-inventory.sh index ab22c1936..ed05f1214 100755 --- a/bin/gen-inventory.sh +++ b/bin/gen-inventory.sh @@ -48,7 +48,7 @@ fi shopt -s nullglob # enable expand to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with '.' -shopt -s globskipdots # enable never matching '.' nor '..' +shopt -s globskipdots # enable never matching '.' or '..' shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable '**' to match all files and zero or more directories and subdirectories @@ -92,7 +92,7 @@ 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) -P pandoc_opts run 'pandoc wrapper tool' with options found in 'optstr' (def: $PANDOC_WRAPPER_OPTSTR) - NOTE: The 'pandoc_opts' may not contain a single-quote, nor a double-quote. + NOTE: The 'pandoc_opts' may not contain a single-quote or a double-quote. -u repo_url Base level URL of target git repo (def: $REPO_URL) -U top_url Top level URL of web site where HTML files will be viewed (def: $TOP_URL) diff --git a/bin/pandoc-wrapper.sh b/bin/pandoc-wrapper.sh index 53a9dc1c9..669016c76 100755 --- a/bin/pandoc-wrapper.sh +++ b/bin/pandoc-wrapper.sh @@ -49,7 +49,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories @@ -99,7 +99,7 @@ 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) -P pandoc_opts options given to the pandoc tool (def: $PANDOC_ARGS) - NOTE: The 'pandoc_opts' may not contain a single-quote, nor a double-quote. + NOTE: The 'pandoc_opts' may not contain a single-quote or a double-quote. -u repo_url Base level URL of target git repo (def: $REPO_URL) -U top_url Top level URL of web site where HTML files will be viewed (def: $TOP_URL) diff --git a/bin/quick-readme2index.sh b/bin/quick-readme2index.sh index bbcc3abcc..6ad5ec664 100755 --- a/bin/quick-readme2index.sh +++ b/bin/quick-readme2index.sh @@ -66,7 +66,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories @@ -126,7 +126,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] NOTE: The '-p tool' is passed as leading options on tool command lines. -P pandoc_opts run 'pandoc wrapper tool' with options found in 'optstr' (def: $PANDOC_WRAPPER_OPTSTR) NOTE: The '-P pandoc_opts' is passed as leading options on tool command lines. - NOTE: The 'pandoc_opts' may not contain a single-quote, nor a double-quote. + NOTE: The 'pandoc_opts' may not contain a single-quote or a double-quote. -u repo_url Base level URL of target git repo (def: $REPO_URL) NOTE: The '-u repo_url' is passed as leading options on tool command lines. diff --git a/bin/readme2index.sh b/bin/readme2index.sh index 8cf3f1ebf..4df66c1df 100755 --- a/bin/readme2index.sh +++ b/bin/readme2index.sh @@ -42,7 +42,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories @@ -99,29 +99,29 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-n] [-N] -H phase=name use 'phase.name.html' file for HTML phase named 'phase' (def: use 'phase.default.html') -H phase=. ignore processing for HTML phase 'phase' (def: process HTML phase) - NOTE: The 'phase' string may not contain an = (equal), a / (slash), a single-quote, nor a double-quote. - NOTE: The 'name' string may not contain an = (equal), a single-quote, nor a double-quote. + NOTE: The 'phase' string may not contain an = (equal), a / (slash), a single-quote, or a double-quote. + NOTE: The 'name' string may not contain an = (equal), a single-quote, or a double-quote. NOTE: The 'phase.name.html' file is assumed to be under the 'topdir/inc' directory. -b tool run 'before tool' during HTML phase number 20 (def: do not output before pandoc wrapper tool) -b . skip HTML phase number 20 (def: do nothing during HTML phase number 20) -B optstr run 'before tool' with options found in 'optstr' (def: do not add any options to 'before tool') - NOTE: The 'optstr' may not contain a single-quote, nor a double-quote. + NOTE: The 'optstr' may not contain a single-quote or a double-quote. -p tool run 'pandoc wrapper tool' (not pandoc path) during HTML phase number 21 (def: use $PANDOC_WRAPPER) -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. -P optstr run 'pandoc wrapper tool' with options found in 'optstr' (def: $PANDOC_WRAPPER_OPTSTR) - NOTE: The 'optstr' may not contain a single-quote, nor a double-quote. + NOTE: The 'optstr' may not contain a single-quote or a double-quote. NOTE: The '-P optstr' will be passed as leading options on the -b tool and -a tool command lines. -a tool run 'after tool' during HTML phase number 20 (def: do not output after pandoc wrapper tool) -a . skip HTML phase number 22 (def: do nothing during HTML phase number 22) -A optstr run 'after tool' with options found in 'optstr' (def: do not add any options to 'after tool') - NOTE: The 'optstr' may not contain a single-quote, nor a double-quote. + NOTE: The 'optstr' may not contain a single-quote or a double-quote. -s token=value substitute %%token%% with value except in HTML phase numbers 20-29 (def: do not substitute any tokens) - NOTE: The 'token' string may not contain a ; (semicolon), a = (equal), nor a % (percent). + NOTE: The 'token' string may not contain a ; (semicolon), a = (equal) or a % (percent). NOTE: The 'value' string may not contain a ; (semicolon). NOTE: A later '-s token=value' will override an earlier '-s token=value' for the same 'token'. NOTE: Multiple '-s token=value' are cumulative for the unique set of 'token's. @@ -131,7 +131,7 @@ export USAGE="usage: $0 [-h] [-v level] [-V] [-d topdir] [-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) -O tool=optstr run the 'token replace' named 'tool' with options found in 'optstr' (def: do not add any options) - NOTE: Neither 'tool' nor 'optstr' may not contain an = (equal), a single-quote, nor a double-quote. + NOTE: Neither 'tool' nor 'optstr' may not contain an = (equal), a single-quote or a double-quote. NOTE: A later '-O tool=optstr' will override all earlier '-O tool=optstr' for the same 'tool'. NOTE: -O may only be used in command_options and md2html.cfg cfg_options (getopt phases 0 and 2) diff --git a/bin/sort.gitignore b/bin/sort.gitignore index 53ecf58d0..c7c9ebbfa 100755 --- a/bin/sort.gitignore +++ b/bin/sort.gitignore @@ -8,7 +8,7 @@ # # Recommended usage: # -# bin/bin/all-run.sh bin/sort.gitignore +# bin/all-run.sh bin/sort.gitignore # # We use bin/sgi to sort the content of a .gitignore file as follows: # @@ -57,7 +57,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories diff --git a/bin/subst.default.sh b/bin/subst.default.sh index b9748aeeb..9c3930fe4 100755 --- a/bin/subst.default.sh +++ b/bin/subst.default.sh @@ -46,7 +46,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories diff --git a/bin/subst.winner-index.sh b/bin/subst.winner-index.sh index ed624cf7e..961ffbf38 100755 --- a/bin/subst.winner-index.sh +++ b/bin/subst.winner-index.sh @@ -45,7 +45,7 @@ fi shopt -s nullglob # enable expanded to nothing rather than remaining unexpanded shopt -u failglob # disable error message if no matches are found shopt -u dotglob # disable matching files starting with . -shopt -s globskipdots # enable never matching . nor .. +shopt -s globskipdots # enable never matching . or .. shopt -u nocaseglob # disable strict case matching shopt -u extglob # enable extended globbing patterns shopt -s globstar # enable ** to match all files and zero or more directories and subdirectories