chore: minor changes

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

.github/workflows/auto-nightly.yml

@@ -8,14 +8,14 @@ on:
   push:
     paths:
       - "LICENSES/*"
+      - "conf/*.sh"
       - "docs/*.rst"
       - "includes/*"
       - "tools/*.jar"
       - "zip-content/**"
       - "CHANGELOG.rst"
       - "LICENSE*.rst"
       - "build.sh"
-      - "conf-*.sh"
     branches:
       - "**"
   schedule:
@@ -52,15 +52,15 @@ jobs:
         uses: actions/cache@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
+          key: "build-${{ hashFiles('conf/conf-full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
       - name: "Use LFS cache"
         uses: actions/cache@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
+          key: "lfs-${{ hashFiles('conf/conf-lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true
@@ -267,14 +267,14 @@ jobs:
         with:
           lfs: false
           sparse-checkout: |
-            conf/full.inc.sh
-            conf/lfs.inc.sh
+            conf/conf-full.inc.sh
+            conf/conf-lfs.inc.sh
           sparse-checkout-cone-mode: false
       - name: "Ping build cache" # Cache expiration: 7 days
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
+          key: "build-${{ hashFiles('conf/conf-full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
@@ -283,7 +283,7 @@ jobs:
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
+          key: "lfs-${{ hashFiles('conf/conf-lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true

.github/workflows/coverage.yml

@@ -47,15 +47,15 @@ jobs:
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "build-${{ hashFiles('conf/full.inc.sh') }}"
+          key: "build-${{ hashFiles('conf/conf-full.inc.sh') }}"
           restore-keys: "build-"
           path: "cache/build"
           enableCrossOsArchive: true
       - name: "Use LFS cache"
         uses: actions/cache/restore@v5
         timeout-minutes: 5
         with:
-          key: "lfs-${{ hashFiles('conf/lfs.inc.sh') }}"
+          key: "lfs-${{ hashFiles('conf/conf-lfs.inc.sh') }}"
           restore-keys: "lfs-"
           path: "cache/lfs"
           enableCrossOsArchive: true

.gitlab-ci.yml

@@ -35,14 +35,14 @@ stages:
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
         - "LICENSES/*"
+        - "conf/*.sh"
         - "docs/*.rst"
         - "includes/*"
         - "tools/*.jar"
         - "zip-content/**"
         - "CHANGELOG.rst"
         - "LICENSE*.rst"
         - "build.sh"
-        - "conf-*.sh"
       when: always
   cache: []
   script: "BUILD_TYPE='oss' './build.sh'"
@@ -54,14 +54,14 @@ build-job:
     - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       changes:
         - "LICENSES/*"
+        - "conf/*.sh"
         - "docs/*.rst"
         - "includes/*"
         - "tools/*.jar"
         - "zip-content/**"
         - "CHANGELOG.rst"
         - "LICENSE*.rst"
         - "build.sh"
-        - "conf-*.sh"
       when: always
     - if: $CI_PIPELINE_SOURCE == "schedule"
       when: always

build.sh

@@ -64,9 +64,12 @@ detect_script_dir || return 1 2>&- || exit 1
 export BUILD_CACHE_DIR="${MAIN_DIR:?}/cache/build"
 export LFS_CACHE_DIR="${MAIN_DIR:?}/cache/lfs"
 
-unset DO_INIT_CMDLINE
-# shellcheck source=SCRIPTDIR/lib/main.lib.sh
-if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then . "${MAIN_DIR:?}/lib/main.lib.sh"; fi
+{
+  unset DO_INIT_CMDLINE
+  readonly LIB_FILENAME='main.lib.sh'
+  # shellcheck source=SCRIPTDIR/lib/main.lib.sh
+  if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then . "${MAIN_DIR:?}/lib/${LIB_FILENAME:?}"; fi
+}
 
 if test -n "${OPENSOURCE_ONLY-}"; then
   ui_error 'You must set BUILD_TYPE instead of OPENSOURCE_ONLY' "${LINENO-}" "${FUNCNAME-}"
@@ -99,10 +102,10 @@ esac
 save_last_title
 set_title 'Building the flashable zip...'
 
-# shellcheck source=SCRIPTDIR/conf/common.inc.sh
-. "${MAIN_DIR:?}/conf/common.inc.sh"
-# shellcheck source=SCRIPTDIR/conf/full.inc.sh
-if test "${OPENSOURCE_ONLY:?}" = 'false'; then . "${MAIN_DIR:?}/conf/full.inc.sh"; fi
+# shellcheck source=SCRIPTDIR/conf/conf-common.inc.sh
+. "${MAIN_DIR:?}/conf/conf-common.inc.sh"
+# shellcheck source=SCRIPTDIR/conf/conf-full.inc.sh
+if test "${OPENSOURCE_ONLY:?}" = 'false'; then . "${MAIN_DIR:?}/conf/conf-full.inc.sh"; fi
 
 _init_dir="$(pwd)" || ui_error 'Failed to read the current dir' "${LINENO-}" "${FUNCNAME-}"
 

cmdline.bat

@@ -29,7 +29,7 @@ SET "IS_PATH_INITIALIZED="
 SET "__QUOTED_PARAMS="
 SET "__SHELL_EXE=%~dp0tools\win\busybox.exe"
 
-"%__SHELL_EXE%" ash -s -c ". '%~dp0lib\main.lib.sh' || exit ${?}" "ash" %*
+"%__SHELL_EXE%" ash -s -c "readonly LIB_FILENAME='main.lib.sh'; . '%~dp0lib\main.lib.sh' || exit ${?}" "ash" %*
 
 ENDLOCAL 2> nul
 IF %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%

cmdline.sh

@@ -98,11 +98,14 @@ if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then
     unset IS_PATH_INITIALIZED
     unset __QUOTED_PARAMS
 
+    readonly LIB_FILENAME='main.lib.sh'
+    export LIB_FILENAME
+
     if test "${_run_strategy}" = 'source'; then
-      . "${_main_dir}/lib/main.lib.sh" "${@}" || return "${?}"
+      . "${_main_dir}/lib/${LIB_FILENAME}" "${@}" || return "${?}"
     elif test "${_run_strategy}" = 's-opt'; then
       # shellcheck disable=SC2086 # Ignore: Double quote to prevent globbing and word splitting
-      exec "${__SHELL_EXE}" ${_applet} -s -c ". '${_main_dir}/lib/main.lib.sh' || exit \${?}" "${_applet:-${0-}}" "${@}"
+      exec "${__SHELL_EXE}" ${_applet} -s -c ". '${_main_dir}/lib/${LIB_FILENAME}' || exit \${?}" "${_applet:-${0-}}" "${@}"
     else
       if test "${#}" -gt 0; then
         _nl="$(printf '\nx')" _nl="${_nl%x}"
@@ -117,7 +120,7 @@ if test "${A5K_FUNCTIONS_INCLUDED:-false}" = 'false'; then
       fi
 
       # shellcheck disable=SC2086 # Ignore: Double quote to prevent globbing and word splitting
-      exec "${__SHELL_EXE}" ${_applet} --init-file "${_main_dir}/lib/main.lib.sh"
+      exec "${__SHELL_EXE}" ${_applet} --init-file "${_main_dir}/lib/${LIB_FILENAME}"
     fi
   }
 

conf/common.inc.sh conf/conf-common.inc.shconf/common.inc.sh renamed to conf/conf-common.inc.sh

@@ -85,7 +85,7 @@ ui_error()
 
 _ui_error_local()
 {
-  ui_error "${1:?}" "${2-}" "${3-}" 'common.lib.sh'
+  ui_error "${1:?}" "${2-}" "${3-}" "${LIB_FILENAME:?}"
 }
 
 ui_error_msg()
@@ -978,7 +978,7 @@ download_cached_if_lfs_pointer()
     local _expected_sha256 _mirror_url
 
     # shellcheck source=/dev/null
-    command 1> /dev/null -v 'conf_lfs_get_mirror_by_sha256' || command . "${MAIN_DIR:?}/conf/lfs.inc.sh" || _ui_error_local "Failed to source 'conf/lfs.inc.sh'" "${LINENO-}" "${FUNCNAME-}"
+    command 1> /dev/null -v 'conf_lfs_get_mirror_by_sha256' || command . "${MAIN_DIR:?}/conf/conf-lfs.inc.sh" || _ui_error_local "Failed to source 'conf/conf-lfs.inc.sh'" "${LINENO-}" "${FUNCNAME-}"
     _mirror_url="$(conf_lfs_get_mirror_by_sha256 "${3:?}")" || _ui_error_local "Failed to get the mirror" "${LINENO-}" "${FUNCNAME-}"
 
     _expected_sha256=$(grep -m 1 -e '^oid sha256:' -- "${2:?}/${1:?}" | cut -d ':' -f 2 -s) || _ui_error_local "Failed to extract the SHA256 hash from the LFS pointer" "${LINENO-}" "${FUNCNAME-}"
@@ -1515,7 +1515,7 @@ init_cmdline()
 
     if test -f "${MAIN_DIR:?}/lib/inc/custom-aliases.inc.sh"; then
       # shellcheck source=/dev/null
-      . "${MAIN_DIR:?}/lib/inc/custom-aliases.inc.sh" || _ui_error_local 'Unable to source lib/inc/custom-aliases.inc.sh' "${LINENO-}" "${FUNCNAME-}"
+      . "${MAIN_DIR:?}/lib/inc/custom-aliases.inc.sh" || _ui_error_local "Unable to source 'inc/custom-aliases.inc.sh'" "${LINENO-}" "${FUNCNAME-}"
     fi
 
     alias 'build'='build.sh'