diff --git a/.pre-commit-config-github.yaml b/.pre-commit-config-github.yaml index 766b737..694c999 100644 --- a/.pre-commit-config-github.yaml +++ b/.pre-commit-config-github.yaml @@ -52,7 +52,7 @@ repos: fail_fast: true - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: mixed-line-ending - id: end-of-file-fixer @@ -94,7 +94,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.2 + rev: v1.7.3 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.1.0 + rev: v2.0.0 hooks: - id: buildBashBinaries diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a2dd9b9..3fde8c2 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -47,7 +47,7 @@ repos: fail_fast: true - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: mixed-line-ending - id: end-of-file-fixer @@ -89,7 +89,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.2 + rev: v1.7.3 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.1.0 + rev: v2.0.0 hooks: - id: buildBashBinaries diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases index 817fa98..9f80ec9 100755 --- a/bin/dbScriptAllDatabases +++ b/bin/dbScriptAllDatabases @@ -1842,8 +1842,7 @@ dbScriptAllDatabasesCommandParse() { optionQuiet="0" local -i options_parse_optionParsedCountOptionQuiet ((options_parse_optionParsedCountOptionQuiet = 0)) || true - local -i options_parse_optionParsedCountOptionDatabases - ((options_parse_optionParsedCountOptionDatabases = 0)) || true + optionOutputDir="" local -i options_parse_optionParsedCountOptionOutputDir ((options_parse_optionParsedCountOptionOutputDir = 0)) || true @@ -2187,7 +2186,7 @@ dbScriptAllDatabasesCommandParse() { # Option 17/19 # optionDatabases alts --database - # type: StringArray min 0 max 1 + # type: StringArray min 0 max -1 --database) shift if (($# == 0)); then @@ -2195,10 +2194,6 @@ dbScriptAllDatabasesCommandParse() { return 1 fi - if ((options_parse_optionParsedCountOptionDatabases >= 1 )); then - Log::displayError "Command ${SCRIPT_NAME} - Option ${options_parse_arg} - Maximum number of option occurrences reached(1)" - return 1 - fi ((++options_parse_optionParsedCountOptionDatabases)) optionDatabases+=("$1") ;; @@ -2490,8 +2485,8 @@ dbScriptAllDatabasesCommandHelp() { echo echo -e "${__HELP_TITLE_COLOR}SCRIPTS OPTIONS:${__RESET_COLOR}" - echo -e " ${__HELP_OPTION_COLOR}--database ${__HELP_NORMAL} {single}" - Array::wrap2 ' ' 76 4 " " "If provided will check only this db," "otherwise script will be executed on all dbs of mysql server." + echo -e " ${__HELP_OPTION_COLOR}--database ${__HELP_NORMAL} {list} (optional)" + Array::wrap2 ' ' 76 4 " " "If provided will check only databases specified," "otherwise script will be executed on all dbs of mysql server." echo diff --git a/bin/postmanCli b/bin/postmanCli index 8c31f18..e9ce02e 100755 --- a/bin/postmanCli +++ b/bin/postmanCli @@ -1946,7 +1946,7 @@ declare optionQuiet="0" declare optionPostmanModelConfig="" # arguments variables initialization declare argCommand="" -declare commandArgs="" +declare -a commandArgs=() # @description parse command options and arguments for postmanCliCommand postmanCliCommandParse() { Log::displayDebug "Command ${SCRIPT_NAME} - parse arguments: ${BASH_FRAMEWORK_ARGV[*]}" @@ -1999,7 +1999,7 @@ postmanCliCommandParse() { local -i options_parse_argParsedCountArgCommand ((options_parse_argParsedCountArgCommand = 0)) || true - commandArgs="" + commandArgs=() # shellcheck disable=SC2034 @@ -2329,7 +2329,8 @@ postmanCliCommandParse() { elif (( options_parse_parsedArgIndex >= minParsedArgIndex1 )); then ((++options_parse_argParsedCountCommandArgs)) # shellcheck disable=SC2034 - commandArgs="${options_parse_arg}" + # shellcheck disable=SC2034 + commandArgs+=("${options_parse_arg}") # else too much args diff --git a/bin/waitForIt b/bin/waitForIt index 9f54fad..5e306a8 100755 --- a/bin/waitForIt +++ b/bin/waitForIt @@ -2053,7 +2053,7 @@ waitForItCommandHelp() { echo echo - echo -e "${__HELP_TITLE_COLOR}OPTIONS:${__RESET_COLOR}" + echo -e "${__HELP_TITLE_COLOR}SPECIFIC OPTIONS:${__RESET_COLOR}" echo -e " ${__HELP_OPTION_COLOR}--algorithm${__HELP_NORMAL}, ${__HELP_OPTION_COLOR}--algo ${__HELP_NORMAL} {single}" algorithmHelpFunction diff --git a/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml b/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml index 9943785..5242b94 100644 --- a/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml +++ b/src/_binaries/Database/dbScriptAllDatabases/dbScriptAllDatabases-binary.yaml @@ -55,8 +55,8 @@ binData: group: groupScriptsOptions type: StringArray help: - "If provided will check only this db,\notherwise script will be - executed on all dbs of mysql server." + "If provided will check only databases specified,\notherwise script + will be executed on all dbs of mysql server." helpValueName: dbName alts: - --database diff --git a/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt b/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt index d48cd09..bcff151 100644 --- a/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt +++ b/src/_binaries/Database/dbScriptAllDatabases/testsData/dbScriptAllDatabases.help.txt @@ -80,8 +80,8 @@ Quiet mode, doesn't display any output. SCRIPTS OPTIONS: - --database  {single} - If provided will check only this db, + --database  {list} (optional) + If provided will check only databases specified, otherwise script will be executed on all dbs of mysql server. --output, -o  {single} Output directory, see log-format option. diff --git a/src/_binaries/Postman/postmanCli/postmanCli-binary.yaml b/src/_binaries/Postman/postmanCli/postmanCli-binary.yaml index fe482bd..33bb172 100644 --- a/src/_binaries/Postman/postmanCli/postmanCli-binary.yaml +++ b/src/_binaries/Postman/postmanCli/postmanCli-binary.yaml @@ -43,7 +43,7 @@ binData: name: command variableName: argCommand - - type: String + - type: StringArray min: 0 max: -1 help: commandArgsHelpFunction diff --git a/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt b/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt index e576098..dcd79df 100644 --- a/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt +++ b/src/_binaries/Utils/waitForIt/testsData/waitForIt.help.txt @@ -74,7 +74,7 @@ --quiet, -q {single} Quiet mode, doesn't display any output. -OPTIONS: +SPECIFIC OPTIONS: --algorithm, --algo  {single} Algorithm to use Check algorithms list below. Default: automatic selection based on commands availability and timeout option value. diff --git a/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml b/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml index 82717c0..6cb1484 100644 --- a/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml +++ b/src/_binaries/Utils/waitForIt/waitForIt-binary.yaml @@ -59,7 +59,7 @@ binData: optionGroups: waitForItOptionGroup: - title: "OPTIONS:" + title: "SPECIFIC OPTIONS:" options: - variableName: optionAlgo