Maintenance bash-tools-framework 6.1.1

- Update github worflows cron scheduling
- Update github worflows versions
- bash-compiler uses DEFAULT_TEMPLATE_FOLDER
- recompiled all binaries to use bash-tools-framework 6.1.1
- updated pre-commit versions

.bash-compiler

@@ -1,3 +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
+TEMPLATES_ROOT_DIR=${DEFAULT_TEMPLATE_FOLDER}

.cspell/softwares.txt

@@ -130,6 +130,7 @@ pcmanfm
 phpmd
 phpstorm
 Phpstorm
+pipx
 pixbuf
 plantuml
 Plantuml
@@ -181,3 +182,4 @@ xsession
 Xsrv
 xvfb
 Xvfb
+yapf

.github/dependabot.yml

@@ -6,6 +6,8 @@ updates:
     directory: "/"
     schedule:
       # Check for updates to GitHub Actions every week
-      interval: "weekly"
+      interval: "monthly"
       day: "friday"
+      time: "22:00"
+      timezone: "Europe/Paris"
     open-pull-requests-limit: 1

.github/workflows/docsify-gh-pages.yml

@@ -42,7 +42,7 @@ jobs:
           ./bin/doc --ci
 
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3

.github/workflows/lint-test.yml

@@ -49,7 +49,7 @@ jobs:
       # needed by megalinter
       pull-requests: write
     steps:
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         with:
           name: build-bash-tools
           status: pending
@@ -81,7 +81,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         with:
           name: pre-commit-megalinter
           status: pending
@@ -171,7 +171,7 @@ jobs:
           env.COND_UPDATED_SOURCES == 'true' &&
           env.COND_APPLY_FIXES_NEEDED == 'true' &&
           !contains(github.event.head_commit.message, 'skip fix')
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.generate-token.outputs.token }}
           committer: fchastanet <[email protected]>
@@ -191,7 +191,7 @@ jobs:
           echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
           echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
 
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         if: ${{ always() }}
         with:
           name: pre-commit-megalinter
@@ -246,7 +246,7 @@ jobs:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         with:
           name: unit-tests-${{matrix.vendor}}-${{matrix.bashTarVersion}}
           status: pending
@@ -315,7 +315,7 @@ jobs:
           path: |
             logs/**
 
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         with:
           name: unit-tests-${{matrix.vendor}}-${{matrix.bashTarVersion}}
           status: ${{ job.status }}
@@ -334,7 +334,7 @@ jobs:
       # You can get the conclusion via env (env.WORKFLOW_CONCLUSION)
       - uses: AbsoLouie/[email protected]
 
-      - uses: akatov/commit-status-updater@a9e988ec5454692ff7745a509452422a35172ad6
+      - uses: ouzi-dev/commit-status-updater@v2
         with:
           name: build-bash-tools
           # neutral, success, skipped, cancelled, timed_out, action_required, failure

.github/workflows/precommit-autoupdate.yml

@@ -5,7 +5,7 @@ on: # yamllint disable-line rule:truthy
   workflow_dispatch:
   schedule:
     # https://crontab.cronhub.io/
-    - cron: "30 10 * * *"
+    - cron: "30 22 1-7 */3 FRI"
 jobs:
   auto-update:
     runs-on: ubuntu-22.04
@@ -37,7 +37,7 @@ jobs:
           private_key: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ steps.generate-token.outputs.token }}
           committer: fchastanet <[email protected]>

.pre-commit-config-github.yaml

@@ -9,6 +9,16 @@ default_stages: [pre-commit, manual]
 minimum_pre_commit_version: 3.5.0
 fail_fast: false
 repos:
+  # enables pre-commit to install the hooks using pipx
+  - repo: https://github.com/pypa/pipx
+    rev: 1.7.1
+    hooks:
+      - id: pipx
+        alias: yapf
+        name: yapf
+        args: ["yapf", "-i"]
+        types: ["python"]
+
   - repo: local
     # this hook is not intended to be run on github
     # it just allows to generate the same pre-commit
@@ -25,7 +35,7 @@ repos:
 
   - repo: https://github.com/executablebooks/mdformat
     # Do this before other tools "fixing" the line endings
-    rev: 0.7.19
+    rev: 0.7.21
     hooks:
       - id: mdformat
         name: Format Markdown
@@ -161,7 +171,7 @@ repos:
         exclude: /testsData/
 
   - repo: https://github.com/fchastanet/bash-tools-framework
-    rev: 6.0.0
+    rev: 6.1.1
     hooks:
       - id: fixShebangExecutionBit
       - id: awkLint
@@ -210,6 +220,6 @@ repos:
         stages: [manual] # GITHUB
 
   - repo: https://github.com/fchastanet/bash-compiler
-    rev: v3.0.0
+    rev: 3.1.2
     hooks:
       - id: buildBashBinaries

.pre-commit-config.yaml

@@ -4,6 +4,16 @@ default_stages: [pre-commit, manual]
 minimum_pre_commit_version: 3.5.0
 fail_fast: true
 repos:
+  # enables pre-commit to install the hooks using pipx
+  - repo: https://github.com/pypa/pipx
+    rev: 1.7.1
+    hooks:
+      - id: pipx
+        alias: yapf
+        name: yapf
+        args: ["yapf", "-i"]
+        types: ["python"]
+
   - repo: local
     # this hook is not intended to be run on github
     # it just allows to generate the same pre-commit
@@ -20,7 +30,7 @@ repos:
 
   - repo: https://github.com/executablebooks/mdformat
     # Do this before other tools "fixing" the line endings
-    rev: 0.7.19
+    rev: 0.7.21
     hooks:
       - id: mdformat
         name: Format Markdown
@@ -156,7 +166,7 @@ repos:
         exclude: /testsData/
 
   - repo: https://github.com/fchastanet/bash-tools-framework
-    rev: 6.0.0
+    rev: 6.1.1
     hooks:
       - id: fixShebangExecutionBit
       - id: awkLint
@@ -205,6 +215,6 @@ repos:
         stages: [] # GITHUB
 
   - repo: https://github.com/fchastanet/bash-compiler
-    rev: v3.0.0
+    rev: 3.1.2
     hooks:
       - id: buildBashBinaries

bin/cli

@@ -801,6 +801,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -809,7 +810,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/dbImport

@@ -1031,6 +1031,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -1039,7 +1040,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/dbImportProfile

@@ -910,6 +910,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -918,7 +919,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/dbImportStream

@@ -938,6 +938,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -946,7 +947,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/dbQueryAllDatabases

@@ -988,6 +988,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -996,7 +997,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/dbScriptAllDatabases

@@ -890,6 +890,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -898,7 +899,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034

bin/doc

@@ -728,6 +728,7 @@ Log::computeDuration() {
   if ((${DISPLAY_DURATION:-0} == 1)); then
     local -i duration=0
     local -i delta=0
+    local durationStr deltaStr
     local -i currentLogDate
     currentLogDate="${EPOCHREALTIME/[^0-9]/}"
     if ((LOG_LAST_LOG_DATE_INIT == 1)); then
@@ -736,7 +737,17 @@ Log::computeDuration() {
     else
       duration=$(((currentLogDate - FIRST_LOG_DATE) / 1000000))
       delta=$(((currentLogDate - LOG_LAST_LOG_DATE) / 1000000))
-      LOG_LAST_DURATION_STR="${duration}s/+${delta}s"
+      if ((duration > 59)); then
+        durationStr=$(date -ud "@${duration}" +'%H:%M:%S')
+      else
+        durationStr="${duration}s"
+      fi
+      if ((delta > 59)); then
+        deltaStr=$(date -ud "@${delta}" +'%H:%M:%S')
+      else
+        deltaStr="${delta}s"
+      fi
+      LOG_LAST_DURATION_STR="${durationStr}/+${deltaStr}"
     fi
     LOG_LAST_LOG_DATE="${currentLogDate}"
     # shellcheck disable=SC2034