chore: minor changes

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

Author: ale5000-git

.vscode/tasks.json

@@ -25,7 +25,7 @@
                 "fileLocation": "search",
                 "pattern": [
                     {
-                        "regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)$",
+                        "regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)\\r?$",
                         "file": 1,
                         "line": 2,
                         "severity": 3,
@@ -55,7 +55,7 @@
                 "fileLocation": "search",
                 "pattern": [
                     {
-                        "regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)$",
+                        "regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)\\r?$",
                         "file": 1,
                         "line": 2,
                         "severity": 3,

build.sh

@@ -130,7 +130,7 @@ if test -n "${ZIP_SHORT_COMMIT_ID?}"; then
 fi
 
 if test "${OPENSOURCE_ONLY:?}" != 'false'; then
-  if ! is_oss_only_build_enabled; then
+  if ! conf_is_oss_only_build_enabled; then
     echo 'WARNING: The OSS only build is disabled'
     set_title 'OSS only build is disabled'
 
@@ -222,15 +222,15 @@ FILENAME_EXT='.zip'
 # Download and verify external application files to ensure package integrity; bundled files will be verified at a later stage
 {
   if test "${OPENSOURCE_ONLY:?}" = 'false'; then
-    current_dl_list="$(files_to_download)" || ui_error 'Missing download list' "${LINENO-}" "${FUNCNAME-}"
+    current_dl_list="$(conf_full_files_to_download)" || ui_error 'Missing download list' "${LINENO-}" "${FUNCNAME-}"
     dl_list "${current_dl_list?}" || ui_error 'Failed to download the necessary files' "${LINENO-}" "${FUNCNAME-}"
 
     dl_file 'misc/keycheck' 'keycheck-arm.bin' '2e348074961b78c2cf9e8728910ce7c9596f195a6344ead35e536ccebe18df76' 'github.com/someone755/kerneller/raw/9bb15ca2e73e8b81e412d595b52a176bdeb7c70a/extract/tools/keycheck' ''
   else
     echo 'Skipped not OSS files!'
   fi
 
-  current_dl_list="$(oss_files_to_download)" || ui_error 'Missing download list' "${LINENO-}" "${FUNCNAME-}"
+  current_dl_list="$(conf_oss_files_to_download)" || ui_error 'Missing download list' "${LINENO-}" "${FUNCNAME-}"
   dl_list "${current_dl_list?}" || ui_error 'Failed to download the necessary files' "${LINENO-}" "${FUNCNAME-}"
 
   clear_dl_temp_dir || ui_error 'Failed to remove the DL temp dir' "${LINENO-}" "${FUNCNAME-}"
@@ -277,7 +277,7 @@ if test -e "${TEMP_DIR:?}/zip-content/origin/file-list.dat"; then
 fi
 
 if test "${OPENSOURCE_ONLY:?}" = 'false'; then
-  files_to_download | while IFS='|' read -r LOCAL_FILENAME LOCAL_PATH MIN_API MAX_API FINAL_FILENAME INTERNAL_NAME FILE_HASH _; do
+  conf_full_files_to_download | while IFS='|' read -r LOCAL_FILENAME LOCAL_PATH MIN_API MAX_API FINAL_FILENAME INTERNAL_NAME FILE_HASH _; do
     mkdir -p -- "${TEMP_DIR:?}/zip-content/origin/${LOCAL_PATH:?}"
     cp -f -- "${BUILD_CACHE_DIR:?}/${LOCAL_PATH:?}/${LOCAL_FILENAME:?}.apk" "${TEMP_DIR:?}/zip-content/origin/${LOCAL_PATH:?}/" || ui_error "Failed to copy to the temp dir the file => '${LOCAL_PATH}/${LOCAL_FILENAME}.apk'" "${LINENO-}" "${FUNCNAME-}"
 

conf/common.inc.sh

@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-is_oss_only_build_enabled()
+conf_is_oss_only_build_enabled()
 { # 0 => true, 1 => false
   return 1
 }
 
-oss_files_to_download()
+conf_oss_files_to_download()
 {
   cat << 'EOF'
 EOF

conf/full.inc.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-files_to_download()
+conf_full_files_to_download()
 {
   cat << 'EOF'
 GoogleContactsSyncAdapter12|priv-app|31||GoogleContactsSyncAdapter|com.google.android.syncadapters.contacts|b680052da895d9a198b856162148de78bc5ad550e46d92239ee9c9308c86ee04|www.apkmirror.com/apk/google-inc/google-contacts-sync/google-contacts-sync-12-8361351-release/google-contacts-sync-12-8361351-android-apk-download/|cold1.gofile.io/download/web/e9cee2f5-0c8c-4fe1-9d5a-3cf13ab395f7/GoogleContactsSyncAdapter12.apk

conf/lfs.inc.sh

@@ -2,10 +2,14 @@
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-get_mirror_by_sha256()
+conf_lfs_get_mirror_by_sha256()
 {
   case "${1?}" in
-    *) ui_error "Unknown hash => ${1?}" ;;
+    *)
+      ui_nl
+      # shellcheck disable=SC3028 # Ignore: In POSIX sh, FUNCNAME is undefined
+      ui_error "Unknown hash => ${1?}" "${LINENO-}" "${FUNCNAME-}"
+      ;;
   esac
 
   return 0

lib/common.lib.sh

@@ -71,7 +71,14 @@ beep()
 # @see restore_saved_title_if_exist()
 ui_error()
 {
-  printf 1>&2 '%s:%s: ERROR: [%s] %s\n' "${4:-"${0##*/}"}" "${2:-0}" "${3:-<main>}" "${1:?}"
+  local _source_file
+  case "${3-}" in
+    conf_lfs_*) _source_file='lfs.inc.sh' ;;
+    conf_full_*) _source_file='full.inc.sh' ;;
+    conf_*) _source_file='common.inc.sh' ;;
+    *) _source_file="${4:-"${0##*/}"}" ;;
+  esac
+  printf 1>&2 '%s:%s: ERROR: [%s] %s\n' "${_source_file?}" "${2:-0}" "${3:-<main>}" "${1:?}"
 
   pause_if_needed 0
   restore_saved_title_if_exist
@@ -98,6 +105,11 @@ ui_debug()
   printf 1>&2 '%s\n' "${1?}"
 }
 
+ui_nl()
+{
+  printf 1>&2 '\n'
+}
+
 export DL_DEBUG="${DL_DEBUG:-false}"
 export http_proxy="${http_proxy-}"
 export ftp_proxy="${ftp_proxy-}"
@@ -968,8 +980,8 @@ download_cached_if_lfs_pointer()
     local _expected_sha256 _mirror_url
 
     # shellcheck source=/dev/null
-    command 1> /dev/null -v 'get_mirror_by_sha256' || command . "${MAIN_DIR:?}/conf/lfs.inc.sh" || _ui_error_local "Failed to source 'conf/lfs.inc.sh'" "${LINENO-}" "${FUNCNAME-}"
-    _mirror_url="$(get_mirror_by_sha256 "${3:?}")" || _ui_error_local "Failed to get the mirror" "${LINENO-}" "${FUNCNAME-}"
+    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-}"
+    _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-}"
     dl_file 'LFS' "${_expected_sha256:?}" "${3:?}" "${_mirror_url:?}" ''