diff --git a/.bash-compiler b/.bash-compiler index 20a6e52..825ed72 100644 --- a/.bash-compiler +++ b/.bash-compiler @@ -1,2 +1,3 @@ FRAMEWORK_ROOT_DIR=${ROOT_DIR}/vendor/bash-tools-framework BASH_TOOLS_ROOT_DIR=${ROOT_DIR} +TEMPLATES_ROOT_DIR=${HOME}/fchastanet/bash-compiler/examples/templates diff --git a/.github/workflows/lint-test.yml b/.github/workflows/lint-test.yml index 8244345..a06b11d 100644 --- a/.github/workflows/lint-test.yml +++ b/.github/workflows/lint-test.yml @@ -74,7 +74,7 @@ jobs: git_user_signingkey: true git_commit_gpgsign: true - - uses: tibdex/github-app-token@v1 + - uses: tibdex/github-app-token@v2 if: ${{ success() }} id: generate-token with: @@ -239,7 +239,7 @@ jobs: git_user_signingkey: true git_commit_gpgsign: true - - uses: tibdex/github-app-token@v1 + - uses: tibdex/github-app-token@v2 if: ${{ success() }} id: generate-token with: @@ -292,7 +292,7 @@ jobs: exit "${status}" - name: Publish Test Report - uses: mikepenz/action-junit-report@v4 + uses: mikepenz/action-junit-report@v5 if: ${{ always()}} with: token: ${{ github.token }} @@ -303,7 +303,7 @@ jobs: report_paths: "logs/**.xml" - name: Checkstyle aggregation - uses: lcollins/checkstyle-github-action@v3.0.0 + uses: lcollins/checkstyle-github-action@v3.1.0 with: path: "logs/*.xml" diff --git a/.github/workflows/precommit-autoupdate.yml b/.github/workflows/precommit-autoupdate.yml index 815760d..bdc986d 100644 --- a/.github/workflows/precommit-autoupdate.yml +++ b/.github/workflows/precommit-autoupdate.yml @@ -30,7 +30,7 @@ jobs: git_user_signingkey: true git_commit_gpgsign: true - - uses: tibdex/github-app-token@v1 + - uses: tibdex/github-app-token@v2 id: generate-token with: app_id: ${{ secrets.APP_ID }} diff --git a/.mega-linter-githubAction.yml b/.mega-linter-githubAction.yml index 32775a1..e28dff1 100644 --- a/.mega-linter-githubAction.yml +++ b/.mega-linter-githubAction.yml @@ -1,6 +1,8 @@ --- EXTENDS: - .mega-linter.yml +DISABLE: + - BASH_SHELLCHECK SHOW_ELAPSED_TIME: false VALIDATE_ALL_CODEBASE: true diff --git a/.pre-commit-config-github.yaml b/.pre-commit-config-github.yaml index 694c999..421ced7 100644 --- a/.pre-commit-config-github.yaml +++ b/.pre-commit-config-github.yaml @@ -25,7 +25,7 @@ repos: - repo: https://github.com/executablebooks/mdformat # Do this before other tools "fixing" the line endings - rev: 0.7.17 + rev: 0.7.19 hooks: - id: mdformat name: Format Markdown @@ -94,7 +94,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.3 + rev: v1.7.4 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] @@ -128,7 +128,7 @@ repos: ) - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.3.3 + rev: v3.4.2 hooks: - id: prettier exclude: | @@ -210,6 +210,6 @@ repos: stages: [manual] # GITHUB - repo: https://github.com/fchastanet/bash-compiler - rev: v2.0.0 + rev: v3.0.0 hooks: - id: buildBashBinaries diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3fde8c2..f308bbf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,7 +20,7 @@ repos: - repo: https://github.com/executablebooks/mdformat # Do this before other tools "fixing" the line endings - rev: 0.7.17 + rev: 0.7.19 hooks: - id: mdformat name: Format Markdown @@ -89,7 +89,7 @@ repos: )$ - repo: https://github.com/rhysd/actionlint - rev: v1.7.3 + rev: v1.7.4 hooks: - id: actionlint stages: [pre-commit, pre-push, manual] @@ -123,7 +123,7 @@ repos: ) - repo: https://github.com/rbubley/mirrors-prettier - rev: v3.3.3 + rev: v3.4.2 hooks: - id: prettier exclude: | @@ -205,6 +205,6 @@ repos: stages: [] # GITHUB - repo: https://github.com/fchastanet/bash-compiler - rev: v2.0.0 + rev: v3.0.0 hooks: - id: buildBashBinaries diff --git a/bin/cli b/bin/cli index 39ab66f..f329b68 100755 --- a/bin/cli +++ b/bin/cli @@ -353,7 +353,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/dbImport b/bin/dbImport index ea6293c..48705d7 100755 --- a/bin/dbImport +++ b/bin/dbImport @@ -356,7 +356,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/dbImportProfile b/bin/dbImportProfile index 4403d41..5a81baf 100755 --- a/bin/dbImportProfile +++ b/bin/dbImportProfile @@ -356,7 +356,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/dbImportStream b/bin/dbImportStream index 11a28d0..4cd8770 100755 --- a/bin/dbImportStream +++ b/bin/dbImportStream @@ -356,7 +356,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases index 9f010dc..7cf6d50 100755 --- a/bin/dbQueryAllDatabases +++ b/bin/dbQueryAllDatabases @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases index 9f80ec9..61572da 100755 --- a/bin/dbScriptAllDatabases +++ b/bin/dbScriptAllDatabases @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/doc b/bin/doc index a4bed2f..020cb16 100755 --- a/bin/doc +++ b/bin/doc @@ -308,7 +308,7 @@ Assert::tty() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/gitIsAncestorOf b/bin/gitIsAncestorOf index 5e7e6e1..02879ac 100755 --- a/bin/gitIsAncestorOf +++ b/bin/gitIsAncestorOf @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/gitIsBranch b/bin/gitIsBranch index 9fdac87..8572d4e 100755 --- a/bin/gitIsBranch +++ b/bin/gitIsBranch @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/gitRenameBranch b/bin/gitRenameBranch index d0eb25c..ea23601 100755 --- a/bin/gitRenameBranch +++ b/bin/gitRenameBranch @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/installRequirements b/bin/installRequirements index 01fafa4..8f9ee85 100755 --- a/bin/installRequirements +++ b/bin/installRequirements @@ -308,7 +308,7 @@ Assert::tty() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/mysql2puml b/bin/mysql2puml index ec80d4b..1b89a0b 100755 --- a/bin/mysql2puml +++ b/bin/mysql2puml @@ -325,7 +325,7 @@ Assert::tty() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/postmanCli b/bin/postmanCli index e9ce02e..3d6a6f8 100755 --- a/bin/postmanCli +++ b/bin/postmanCli @@ -356,7 +356,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/upgradeGithubRelease b/bin/upgradeGithubRelease index 28ef8ed..ad4433e 100755 --- a/bin/upgradeGithubRelease +++ b/bin/upgradeGithubRelease @@ -381,7 +381,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/waitForIt b/bin/waitForIt index 5e306a8..e9d6e8e 100755 --- a/bin/waitForIt +++ b/bin/waitForIt @@ -356,7 +356,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/bin/waitForMysql b/bin/waitForMysql index 01436e9..9540481 100755 --- a/bin/waitForMysql +++ b/bin/waitForMysql @@ -339,7 +339,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/conf/dbScripts/extractData b/conf/dbScripts/extractData index 6b0dd9a..a461ca8 100755 --- a/conf/dbScripts/extractData +++ b/conf/dbScripts/extractData @@ -350,7 +350,7 @@ Bash::handlePipelineFailure() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/install b/install index 78b695c..359a274 100755 --- a/install +++ b/install @@ -356,7 +356,7 @@ Backup::dir() { read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -# +##!/usr/bin/env bash # shellcheck disable=SC2034 # Default settings diff --git a/src/BashTools/Conf/requireLoad.sh b/src/BashTools/Conf/requireLoad.sh index 8273431..7d9fc7c 100755 --- a/src/BashTools/Conf/requireLoad.sh +++ b/src/BashTools/Conf/requireLoad.sh @@ -1,7 +1,7 @@ #!/bin/bash read -r -d '\0' bashToolsDefaultConfigTemplate <<-EOM || true -#{{ include ".env" .Data . -}} +#{{ includeFile "${BASH_TOOLS_ROOT_DIR}/conf/defaultEnv/.env" -}} EOM # @description loads ~/.bash-tools/.env if available diff --git a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png index 2f3081b..ef2e4fa 100644 Binary files a/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png and b/src/_binaries/Converters/mysql2puml/testsData/mysql2puml.png differ