From bf4e181e86002cbc0b2a2f1612bf4a9e211bd4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chastanet?= Date: Sat, 28 Sep 2024 17:15:31 +0200 Subject: [PATCH] using bash-compiler v1.1.0 - fixed log file path using BASH_TOOLS_ROOT_DIR base path --- .framework-config | 2 +- .pre-commit-config-github.yaml | 4 ++-- .pre-commit-config.yaml | 4 ++-- bin/cli | 8 +++++++- bin/dbImport | 6 +++++- bin/dbImportProfile | 4 +++- bin/dbImportStream | 6 +++++- bin/dbQueryAllDatabases | 4 +++- bin/dbScriptAllDatabases | 5 ++++- bin/doc | 2 +- bin/gitIsAncestorOf | 6 +++++- bin/gitIsBranch | 4 +++- bin/gitRenameBranch | 6 +++++- bin/installRequirements | 2 +- bin/mysql2puml | 4 +++- bin/postmanCli | 5 ++++- bin/upgradeGithubRelease | 6 +++++- bin/waitForIt | 7 ++++++- bin/waitForMysql | 11 ++++++++++- conf/dbScripts/extractData | 2 +- conf/defaultEnv/.env | 2 +- install | 4 ++-- src/_binaries/build/install/install-main.sh | 2 +- 23 files changed, 80 insertions(+), 26 deletions(-) diff --git a/.framework-config b/.framework-config index f89ee4da..74be3012 100755 --- a/.framework-config +++ b/.framework-config @@ -50,7 +50,7 @@ SRC_FILE_PATH="${CURRENT_COMPILED_RELATIVE_FILE#/}" BASH_FRAMEWORK_THEME="${BASH_FRAMEWORK_THEME:-default}" BASH_FRAMEWORK_LOG_LEVEL="${BASH_FRAMEWORK_LOG_LEVEL:-0}" BASH_FRAMEWORK_DISPLAY_LEVEL="${BASH_FRAMEWORK_DISPLAY_LEVEL:-3}" -BASH_FRAMEWORK_LOG_FILE="${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/${0##*/}.log}" +BASH_FRAMEWORK_LOG_FILE="${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/${0##*/}.log}" BASH_FRAMEWORK_LOG_FILE_MAX_ROTATION="${BASH_FRAMEWORK_LOG_FILE_MAX_ROTATION:-5}" # display elapsed time since last log diff --git a/.pre-commit-config-github.yaml b/.pre-commit-config-github.yaml index 22c1ff7d..766b737e 100644 --- a/.pre-commit-config-github.yaml +++ b/.pre-commit-config-github.yaml @@ -94,7 +94,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.1 + rev: v1.7.2 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] @@ -210,6 +210,6 @@ repos: stages: [manual] # GITHUB - repo: https://github.com/fchastanet/bash-compiler - rev: v1.0.0 + rev: v1.1.0 hooks: - id: buildBashBinaries diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 93ae6e5b..a2dd9b9d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -89,7 +89,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.1 + rev: v1.7.2 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] @@ -205,6 +205,6 @@ repos: stages: [] # GITHUB - repo: https://github.com/fchastanet/bash-compiler - rev: v1.0.0 + rev: v1.1.0 hooks: - id: buildBashBinaries diff --git a/bin/cli b/bin/cli index 72c50b95..39ab66ff 100755 --- a/bin/cli +++ b/bin/cli @@ -385,7 +385,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1714,14 +1714,17 @@ cliCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true containerArg="" + local -i options_parse_argParsedCountContainerArg ((options_parse_argParsedCountContainerArg = 0)) || true userArg="" + local -i options_parse_argParsedCountUserArg ((options_parse_argParsedCountUserArg = 0)) || true commandArg="" + local -i options_parse_argParsedCountCommandArg ((options_parse_argParsedCountCommandArg = 0)) || true @@ -2105,14 +2108,17 @@ cliCommandHelp() { containerArgHelpFunction + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}user${__HELP_NORMAL} {single}]" userArgHelpFunction + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}command${__HELP_NORMAL} {single}]" commandArgHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/dbImport b/bin/dbImport index 16dce0bf..ea6293c5 100755 --- a/bin/dbImport +++ b/bin/dbImport @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -2083,10 +2083,12 @@ dbImportCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true fromDbName="" + local -i options_parse_argParsedCountFromDbName ((options_parse_argParsedCountFromDbName = 0)) || true targetDbName="" + local -i options_parse_argParsedCountTargetDbName ((options_parse_argParsedCountTargetDbName = 0)) || true @@ -2637,10 +2639,12 @@ dbImportCommandHelp() { Array::wrap2 ' ' 76 4 " " "The name of the source/remote database." echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}${__HELP_NORMAL} {single}]" Array::wrap2 ' ' 76 4 " " "The name of the target database" "Default value: (without extension)" "" echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/dbImportProfile b/bin/dbImportProfile index fd7b9586..4403d41e 100755 --- a/bin/dbImportProfile +++ b/bin/dbImportProfile @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1894,6 +1894,7 @@ dbImportProfileCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true fromDbName="" + local -i options_parse_argParsedCountFromDbName ((options_parse_argParsedCountFromDbName = 0)) || true @@ -2332,6 +2333,7 @@ dbImportProfileCommandHelp() { Array::wrap2 ' ' 76 4 " " "The name of the source/remote database." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/dbImportStream b/bin/dbImportStream index 9dcfa324..11a28d0c 100755 --- a/bin/dbImportStream +++ b/bin/dbImportStream @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1918,10 +1918,12 @@ dbImportStreamCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true argDumpFile="" + local -i options_parse_argParsedCountArgDumpFile ((options_parse_argParsedCountArgDumpFile = 0)) || true argTargetDbName="" + local -i options_parse_argParsedCountArgTargetDbName ((options_parse_argParsedCountArgTargetDbName = 0)) || true @@ -2402,10 +2404,12 @@ dbImportStreamCommandHelp() { Array::wrap2 ' ' 76 4 " " "The file that will be streamed through mysql." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}argTargetDbName${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The name of the mysql target database." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases index ee53b35f..9f010dc4 100755 --- a/bin/dbQueryAllDatabases +++ b/bin/dbQueryAllDatabases @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1948,6 +1948,7 @@ dbQueryAllDatabasesCommandParse() { ((options_parse_optionParsedCountOptionSeparator = 0)) || true argQuery="" + local -i options_parse_argParsedCountArgQuery ((options_parse_argParsedCountArgQuery = 0)) || true @@ -2409,6 +2410,7 @@ dbQueryAllDatabasesCommandHelp() { argQueryHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases index 455f0ddb..817fa98f 100755 --- a/bin/dbScriptAllDatabases +++ b/bin/dbScriptAllDatabases @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1852,6 +1852,7 @@ dbScriptAllDatabasesCommandParse() { ((options_parse_optionParsedCountOptionLogFormat = 0)) || true argScriptToExecute="" + local -i options_parse_argParsedCountArgScriptToExecute ((options_parse_argParsedCountArgScriptToExecute = 0)) || true @@ -2369,10 +2370,12 @@ dbScriptAllDatabasesCommandHelp() { Array::wrap2 ' ' 76 4 " " "The script that will be executed on each databases." echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}scriptArguments${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Optional parameters to pass to the script." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/doc b/bin/doc index 46c52e8e..a4bed2f6 100755 --- a/bin/doc +++ b/bin/doc @@ -340,7 +340,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level diff --git a/bin/gitIsAncestorOf b/bin/gitIsAncestorOf index 51361e5e..5e7e6e12 100755 --- a/bin/gitIsAncestorOf +++ b/bin/gitIsAncestorOf @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1385,10 +1385,12 @@ gitIsAncestorOfCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true claimedBranchArg="" + local -i options_parse_argParsedCountClaimedBranchArg ((options_parse_argParsedCountClaimedBranchArg = 0)) || true refArg="" + local -i options_parse_argParsedCountRefArg ((options_parse_argParsedCountRefArg = 0)) || true @@ -1785,10 +1787,12 @@ gitIsAncestorOfCommandHelp() { Array::wrap2 ' ' 76 4 " " "The branch in which the ref will be searched." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "The ref to check." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/gitIsBranch b/bin/gitIsBranch index e05a8535..9fdac87d 100755 --- a/bin/gitIsBranch +++ b/bin/gitIsBranch @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1384,6 +1384,7 @@ gitIsBranchCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true branchNameArg="" + local -i options_parse_argParsedCountBranchNameArg ((options_parse_argParsedCountBranchNameArg = 0)) || true @@ -1760,6 +1761,7 @@ gitIsBranchCommandHelp() { Array::wrap2 ' ' 76 4 " " "The branch name to check." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/gitRenameBranch b/bin/gitRenameBranch index 74d6696d..d0eb25c2 100755 --- a/bin/gitRenameBranch +++ b/bin/gitRenameBranch @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1443,10 +1443,12 @@ gitRenameBranchCommandParse() { ((options_parse_optionParsedCountOptionDelete = 0)) || true newBranchNameArg="" + local -i options_parse_argParsedCountNewBranchNameArg ((options_parse_argParsedCountNewBranchNameArg = 0)) || true oldBranchNameArg="" + local -i options_parse_argParsedCountOldBranchNameArg ((options_parse_argParsedCountOldBranchNameArg = 0)) || true @@ -1885,10 +1887,12 @@ gitRenameBranchCommandHelp() { Array::wrap2 ' ' 76 4 " " "The new branch name." echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}oldBranchName${__HELP_NORMAL} {single}]" Array::wrap2 ' ' 76 4 " " "The name of the old branch if not current one." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/installRequirements b/bin/installRequirements index 54fd60eb..01fafa4f 100755 --- a/bin/installRequirements +++ b/bin/installRequirements @@ -340,7 +340,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level diff --git a/bin/mysql2puml b/bin/mysql2puml index 0e002426..ec80d4bb 100755 --- a/bin/mysql2puml +++ b/bin/mysql2puml @@ -357,7 +357,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1446,6 +1446,7 @@ mysql2pumlCommandParse() { ((options_parse_optionParsedCountOptionSkin = 0)) || true inputSqlFile="" + local -i options_parse_argParsedCountInputSqlFile ((options_parse_argParsedCountInputSqlFile = 0)) || true @@ -1825,6 +1826,7 @@ mysql2pumlCommandHelp() { Array::wrap2 ' ' 76 4 " " "Sql filepath to parse (read from stdin if not provided)." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/postmanCli b/bin/postmanCli index b9074042..8c31f180 100755 --- a/bin/postmanCli +++ b/bin/postmanCli @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1995,6 +1995,7 @@ postmanCliCommandParse() { ((options_parse_optionParsedCountOptionPostmanModelConfig = 0)) || true argCommand="" + local -i options_parse_argParsedCountArgCommand ((options_parse_argParsedCountArgCommand = 0)) || true @@ -2392,10 +2393,12 @@ postmanCliCommandHelp() { Array::wrap2 ' ' 76 8 " - ${__OPTION_COLOR}push:${__RESET_COLOR} Push" echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}ref${__HELP_NORMAL} {list} (optional)]" commandArgsHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/upgradeGithubRelease b/bin/upgradeGithubRelease index 23f66b42..28ef8edd 100755 --- a/bin/upgradeGithubRelease +++ b/bin/upgradeGithubRelease @@ -413,7 +413,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1751,10 +1751,12 @@ upgradeGithubReleaseCommandParse() { ((options_parse_optionParsedCountOptionExactVersion = 0)) || true targetFileArg="" + local -i options_parse_argParsedCountTargetFileArg ((options_parse_argParsedCountTargetFileArg = 0)) || true githubUrlPatternArg="" + local -i options_parse_argParsedCountGithubUrlPatternArg ((options_parse_argParsedCountGithubUrlPatternArg = 0)) || true @@ -2211,10 +2213,12 @@ upgradeGithubReleaseCommandHelp() { Array::wrap2 ' ' 76 4 " " "The binary downloaded will be written to this file path. Ensure the path is writable." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}githubUrlPattern${__HELP_NORMAL} {single} (mandatory)" githubUrlPatternHelpFunction + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/waitForIt b/bin/waitForIt index b9ea61a9..9f54fad6 100755 --- a/bin/waitForIt +++ b/bin/waitForIt @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1449,10 +1449,12 @@ waitForItCommandParse() { ((options_parse_optionParsedCountOptionLegacy = 0)) || true hostOrIpArg="" + local -i options_parse_argParsedCountHostOrIpArg ((options_parse_argParsedCountHostOrIpArg = 0)) || true portArg="" + local -i options_parse_argParsedCountPortArg ((options_parse_argParsedCountPortArg = 0)) || true @@ -1933,14 +1935,17 @@ waitForItCommandHelp() { Array::wrap2 ' ' 76 4 " " "Host or IP under test." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}port${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "TCP port under test." echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Execute command with args after the test finishes or exit with status code if no command provided." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/bin/waitForMysql b/bin/waitForMysql index f3097602..01436e93 100755 --- a/bin/waitForMysql +++ b/bin/waitForMysql @@ -371,7 +371,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1390,18 +1390,22 @@ waitForMysqlCommandParse() { ((options_parse_optionParsedCountOptionQuiet = 0)) || true mysqlHostArg="" + local -i options_parse_argParsedCountMysqlHostArg ((options_parse_argParsedCountMysqlHostArg = 0)) || true mysqlPortArg="" + local -i options_parse_argParsedCountMysqlPortArg ((options_parse_argParsedCountMysqlPortArg = 0)) || true mysqlUserArg="" + local -i options_parse_argParsedCountMysqlUserArg ((options_parse_argParsedCountMysqlUserArg = 0)) || true mysqlPasswordArg="" + local -i options_parse_argParsedCountMysqlPasswordArg ((options_parse_argParsedCountMysqlPasswordArg = 0)) || true @@ -1883,22 +1887,27 @@ waitForMysqlCommandHelp() { Array::wrap2 ' ' 76 4 " " "Mysql host name." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPort${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql port." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlUser${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql user name." echo + Array::wrap2 " " 80 2 " ${__HELP_OPTION_COLOR}mysqlPassword${__HELP_NORMAL} {single} (mandatory)" Array::wrap2 ' ' 76 4 " " "Mysql user password." echo + Array::wrap2 " " 80 2 " [${__HELP_OPTION_COLOR}commandArgs${__HELP_NORMAL} {list} (optional)]" Array::wrap2 ' ' 76 4 " " "Execute command with args after the test finishes or exit with status code if no command provided." echo + # ------------------------------------------ # options section # ------------------------------------------ diff --git a/conf/dbScripts/extractData b/conf/dbScripts/extractData index dbb48415..6b0dd9a4 100755 --- a/conf/dbScripts/extractData +++ b/conf/dbScripts/extractData @@ -382,7 +382,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level diff --git a/conf/defaultEnv/.env b/conf/defaultEnv/.env index 63f8de04..d40b2b34 100755 --- a/conf/defaultEnv/.env +++ b/conf/defaultEnv/.env @@ -30,7 +30,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level diff --git a/install b/install index 3dd1f462..78b695c7 100755 --- a/install +++ b/install @@ -388,7 +388,7 @@ DISPLAY_DURATION=${DISPLAY_DURATION:0} ### all log messages will be redirected to log file specified ### this same path will be used inside and outside of the container ### -BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${FRAMEWORK_ROOT_DIR}/logs/bash.log} +BASH_FRAMEWORK_LOG_FILE=${BASH_FRAMEWORK_LOG_FILE:-${BASH_TOOLS_ROOT_DIR}/logs/bash.log} ### ### LOG Level @@ -1776,7 +1776,7 @@ if [[ -d "${HOME}/.bash-tools" ]]; then if [[ "${optionSkipBackup}" = "1" ]]; then Log::displayInfo "Backup of ~/.bash-tools is set to be skipped" else - BACKUP_DIR="${FRAMEWORK_ROOT_DIR}/logs" \ + BACKUP_DIR="${BASH_TOOLS_ROOT_DIR}/logs" \ Backup::dir "${HOME}" ".bash-tools" fi diff --git a/src/_binaries/build/install/install-main.sh b/src/_binaries/build/install/install-main.sh index 08efb1e3..f10aec64 100755 --- a/src/_binaries/build/install/install-main.sh +++ b/src/_binaries/build/install/install-main.sh @@ -19,7 +19,7 @@ if [[ -d "${HOME}/.bash-tools" ]]; then if [[ "${optionSkipBackup}" = "1" ]]; then Log::displayInfo "Backup of ~/.bash-tools is set to be skipped" else - BACKUP_DIR="${FRAMEWORK_ROOT_DIR}/logs" \ + BACKUP_DIR="${BASH_TOOLS_ROOT_DIR}/logs" \ Backup::dir "${HOME}" ".bash-tools" fi