From 420c7ae7ace0ae8af4e6947ab2a50ac6fc46be64 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Thu, 28 Mar 2024 23:53:07 -0700 Subject: [PATCH] fix and improve debug for bin/md2html.sh and bin/gen-other-html.sh Fix bogus USAGE debug messages in `bin/md2html.sh`. Allow "about to run" debug messages for `-v 3` and higher for `bin/gen-other-html.sh`. In `bin/md2html.sh` changed VERSION from "1.1.2 2024-03-26" to "1.1.3 2024-03-28". In `bin/gen-other-html.sh` changed VERSION from "1.0.2 2024-03-26" to "1.0.3 2024-03-28". Tested the above using `make www` under Linux and macOS. --- bin/gen-other-html.sh | 6 +++--- bin/md2html.sh | 12 +----------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/bin/gen-other-html.sh b/bin/gen-other-html.sh index 4c109b968..9ea4053e0 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.0.2 2024-03-26" +export VERSION="1.0.3 2024-03-28" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -628,8 +628,8 @@ for YYYY in $(< "$TOP_FILE"); do # if [[ -z $NOOP ]]; then - if [[ $V_FLAG -ge 5 ]]; then - echo "$0: debug[5]: about to run: $MD2HTML_SH ${TOOL_OPTION[*]}" \ + if [[ $V_FLAG -ge 3 ]]; then + echo "$0: debug[3]: about to run: $MD2HTML_SH ${TOOL_OPTION[*]}" \ "-s $DESCRIPTION -s $KEYWORDS -s $HEADER_2" \ "-s $UP_LINK -s $UP_TEXT -D $D_OPTION -m $MD_FILE -v $V_FLAG --" \ "$MD_FILE $HTML_FLLE" 1>&2 diff --git a/bin/md2html.sh b/bin/md2html.sh index 29ce6a69f..d893b2d78 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.1.2 2024-03-26" +export VERSION="1.1.3 2024-03-28" NAME=$(basename "$0") export NAME export V_FLAG=0 @@ -720,24 +720,14 @@ function debug_parameters echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: REPO_URL=$REPO_URL" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: SITE_URL=$SITE_URL" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: URL=$URL" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: NOOP=$NOOP" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: DO_NOT_PROCESS=$DO_NOT_PROCESS" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: TOPDIR=$TOPDIR" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: MD2HTML_CFG=$MD2HTML_CFG" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: BEFORE_TOOL=$BEFORE_TOOL" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: P_FLAG_FOUND=$P_FLAG_FOUND" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: CAP_P_FLAG_FOUND=$CAP_P_FLAG_FOUND" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: U_FLAG_FOUND=$U_FLAG_FOUND" 1>&2 - echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: USAGE=$USAGE" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: CAP_U_FLAG_FOUND=$CAP_U_FLAG_FOUND" 1>&2 echo "$0: debug[$DEBUG_LEVEL]: $DBG_PREFIX: AFTER_TOOL=$AFTER_TOOL" 1>&2 for index in "${!TOKEN[@]}"; do