migrated to bash-tools-framework 2.0.0 - use CURRENT_LOADED_ENV_FILE…

… to deduce realiably root dir using .framework-config
fchastanet · Dec 2, 2023 · 42a4c2f · 42a4c2f
1 parent f4cb5ae
commit 42a4c2f
Show file tree

Hide file tree

Showing 19 changed files with 27 additions and 23 deletions.
diff --git a/.framework-config b/.framework-config
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034
 
-BASH_TOOLS_ROOT_DIR="${BASH_TOOLS_ROOT_DIR:-$(cd "$(readlink -e "${BASH_SOURCE[0]%/*}")" && pwd -P)}"
+BASH_TOOLS_ROOT_DIR="$(cd -- "$(dirname -- "${CURRENT_LOADED_ENV_FILE}")" &>/dev/null && pwd -P)"
 FRAMEWORK_ROOT_DIR="${FRAMEWORK_ROOT_DIR:-${BASH_TOOLS_ROOT_DIR}/vendor/bash-tools-framework}"
 FRAMEWORK_SRC_DIR="${FRAMEWORK_SRC_DIR:-${FRAMEWORK_ROOT_DIR}/src}"
 FRAMEWORK_BIN_DIR="${FRAMEWORK_BIN_DIR:-${FRAMEWORK_ROOT_DIR}/bin}"

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -61,7 +61,7 @@ repos:
       - id: prettier
 
   - repo: https://github.com/fchastanet/bash-tools-framework
-    rev: 1.1.8
+    rev: 2.0.0
     hooks:
       - id: fixShebangExecutionBit
       - id: fixShebangExecutionBitGithubActions
@@ -77,6 +77,8 @@ repos:
             plain,
             --theme,
             default-force,
+            --display-level,
+            WARNING,
           ]
       - id: frameworkLinterGithubAction
         args:
@@ -87,6 +89,8 @@ repos:
             checkstyle,
             --theme,
             default-force,
+            --display-level,
+            WARNING,
           ]
       - id: plantuml
       - id: buildShFiles

diff --git a/bin/cli b/bin/cli
@@ -453,7 +453,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/dbImport b/bin/dbImport
@@ -539,7 +539,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/dbImportProfile b/bin/dbImportProfile
@@ -421,7 +421,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/dbImportStream b/bin/dbImportStream
@@ -476,7 +476,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases
diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases
diff --git a/bin/doc b/bin/doc
@@ -239,7 +239,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/gitIsAncestorOf b/bin/gitIsAncestorOf
@@ -239,7 +239,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/gitIsBranch b/bin/gitIsBranch
@@ -239,7 +239,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/gitRenameBranch b/bin/gitRenameBranch
@@ -255,7 +255,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/installRequirements b/bin/installRequirements
@@ -239,7 +239,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/mysql2puml b/bin/mysql2puml
@@ -346,7 +346,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/upgradeGithubRelease b/bin/upgradeGithubRelease
@@ -281,7 +281,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/waitForIt b/bin/waitForIt
@@ -277,7 +277,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/bin/waitForMysql b/bin/waitForMysql
@@ -261,7 +261,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/conf/dbScripts/extractData b/conf/dbScripts/extractData
@@ -564,7 +564,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }

diff --git a/install b/install
@@ -239,7 +239,7 @@ Env::requireLoad() {
 
   for file in "${configFiles[@]}"; do
     # shellcheck source=/.framework-config
-    source "${file}" || {
+    CURRENT_LOADED_ENV_FILE="${file}" source "${file}" || {
       Log::displayError "while loading config file: ${file}"
       return 1
     }