From 1793b0f08207015342e1d02b154f90c33503a9ba Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Fri, 23 Jun 2023 16:35:29 +0800
Subject: [PATCH] format

---
 .../arpl/overlayfs/opt/arpl/include/addons.sh |  9 ++---
 .../overlayfs/opt/arpl/include/configFile.sh  |  3 +-
 .../arpl/overlayfs/opt/arpl/include/consts.sh |  1 -
 .../overlayfs/opt/arpl/include/functions.sh   | 38 +++++++++----------
 .../arpl/overlayfs/opt/arpl/include/i18n.sh   |  5 +--
 .../overlayfs/opt/arpl/include/modules.sh     | 21 +++++-----
 6 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/files/board/arpl/overlayfs/opt/arpl/include/addons.sh b/files/board/arpl/overlayfs/opt/arpl/include/addons.sh
index a754ff98..6e830307 100755
--- a/files/board/arpl/overlayfs/opt/arpl/include/addons.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/addons.sh
@@ -1,4 +1,3 @@
-
 ###############################################################################
 # Return list of available addons
 # 1 - Platform
@@ -6,11 +5,11 @@
 function availableAddons() {
   while read D; do
     [ ! -f "${D}/manifest.yml" ] && continue
-    ADDON=`basename ${D}`
+    ADDON=$(basename ${D})
     checkAddonExist "${ADDON}" "${1}" "${2}" || continue
-    SYSTEM=`readConfigKey "system" "${D}/manifest.yml"`
+    SYSTEM=$(readConfigKey "system" "${D}/manifest.yml")
     [ "${SYSTEM}" = "true" ] && continue
-    DESC="`readConfigKey "description" "${D}/manifest.yml"`"
+    DESC="$(readConfigKey "description" "${D}/manifest.yml")"
     echo -e "${ADDON}\t${DESC}"
   done < <(find "${ADDONS_PATH}" -maxdepth 1 -type d | sort)
 }
@@ -67,7 +66,7 @@ function untarAddon() {
   rm -rf "${TMP_PATH}/addon"
   mkdir -p "${TMP_PATH}/addon"
   tar -xaf "${1}" -C "${TMP_PATH}/addon" || return
-  ADDON=`readConfigKey "name" "${TMP_PATH}/addon/manifest.yml"`
+  ADDON=$(readConfigKey "name" "${TMP_PATH}/addon/manifest.yml")
   [ -z "${ADDON}" ] && return
   rm -rf "${ADDONS_PATH}/${ADDON}"
   mv "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}"
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/configFile.sh b/files/board/arpl/overlayfs/opt/arpl/include/configFile.sh
index f8838c78..9de0be5d 100644
--- a/files/board/arpl/overlayfs/opt/arpl/include/configFile.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/configFile.sh
@@ -1,4 +1,3 @@
-
 ###############################################################################
 # Delete a key in config file
 # 1 - Path of Key
@@ -22,7 +21,7 @@ function writeConfigKey() {
 # 2 - Path of yaml config file
 # Return Value
 function readConfigKey() {
-  RESULT=`yq eval '.'${1}' | explode(.)' "${2}"`
+  RESULT=$(yq eval '.'${1}' | explode(.)' "${2}")
   [ "${RESULT}" == "null" ] && echo "" || echo ${RESULT}
 }
 
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
index f3e89b8b..46ff209f 100644
--- a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
@@ -1,4 +1,3 @@
-
 ARPL_VERSION="23.6.6"
 ARPL_TITLE="ARPL-i18n v${ARPL_VERSION}"
 
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/functions.sh b/files/board/arpl/overlayfs/opt/arpl/include/functions.sh
index 4f806ae7..1548939f 100644
--- a/files/board/arpl/overlayfs/opt/arpl/include/functions.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/functions.sh
@@ -33,7 +33,7 @@ function readModelArray() {
 # Check if loader is fully configured
 # Returns 1 if not
 function loaderIsConfigured() {
-  SN="`readConfigKey "sn" "${USER_CONFIG_FILE}"`"
+  SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
   [ -z "${SN}" ] && return 1
   [ ! -f "${MOD_ZIMAGE_FILE}" ] && return 1
   [ ! -f "${MOD_RDGZ_FILE}" ] && return 1
@@ -60,13 +60,13 @@ function dieLog() {
 ###############################################################################
 # Generate a number with 6 digits from 1 to 30000
 function random() {
-  printf "%06d" $(($RANDOM %30000 +1 ))
+  printf "%06d" $(($RANDOM % 30000 + 1))
 }
 
 ###############################################################################
 # Generate a hexa number from 0x00 to 0xFF
 function randomhex() {
-  printf "&02X" "$(( $RANDOM %255 +1 ))"
+  printf "&02X" "$(($RANDOM % 255 + 1))"
 }
 
 ###############################################################################
@@ -80,9 +80,9 @@ function generateRandomLetter() {
 ###############################################################################
 # Generate a random digit (0-9A-Z)
 function generateRandomValue() {
-	 for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F G H J K L M N P Q R S T V W X Y Z; do
-     echo $i
-	 done | sort -R | tail -1
+  for i in 0 1 2 3 4 5 6 7 8 9 A B C D E F G H J K L M N P Q R S T V W X Y Z; do
+    echo $i
+  done | sort -R | tail -1
 }
 
 ###############################################################################
@@ -90,15 +90,15 @@ function generateRandomValue() {
 # 1 - Model
 # Returns serial number
 function generateSerial() {
-  SERIAL="`readModelArray "${1}" "serial.prefix" | sort -R | tail -1`"
-  SERIAL+=`readModelKey "${1}" "serial.middle"`
-  case "`readModelKey "${1}" "serial.suffix"`" in
-    numeric)
-      SERIAL+=$(random)      
-      ;;
-    alpha)
-      SERIAL+=$(generateRandomLetter)$(generateRandomValue)$(generateRandomValue)$(generateRandomValue)$(generateRandomValue)$(generateRandomLetter)
-      ;;
+  SERIAL="$(readModelArray "${1}" "serial.prefix" | sort -R | tail -1)"
+  SERIAL+=$(readModelKey "${1}" "serial.middle")
+  case "$(readModelKey "${1}" "serial.suffix")" in
+  numeric)
+    SERIAL+=$(random)
+    ;;
+  alpha)
+    SERIAL+=$(generateRandomLetter)$(generateRandomValue)$(generateRandomValue)$(generateRandomValue)$(generateRandomValue)$(generateRandomLetter)
+    ;;
   esac
   echo ${SERIAL}
 }
@@ -109,8 +109,8 @@ function generateSerial() {
 # 2 - Serial number to test
 # Returns 1 if serial number is valid
 function validateSerial() {
-  PREFIX=`readModelArray "${1}" "serial.prefix"`
-  MIDDLE=`readModelKey "${1}" "serial.middle"`
+  PREFIX=$(readModelArray "${1}" "serial.prefix")
+  MIDDLE=$(readModelKey "${1}" "serial.middle")
   S=${2:0:4}
   P=${2:4:3}
   L=${#2}
@@ -164,7 +164,7 @@ function _set_conf_kv() {
   # Delete
   if [ -z "$2" ]; then
     sed -i "$3" -e "s/^$1=.*$//"
-    return $?;
+    return $?
   fi
 
   # Replace
@@ -174,7 +174,7 @@ function _set_conf_kv() {
   fi
 
   # Add if doesn't exist
-  echo "$1=\"$2\"" >> $3
+  echo "$1=\"$2\"" >>$3
 }
 
 ###############################################################################
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/i18n.sh b/files/board/arpl/overlayfs/opt/arpl/include/i18n.sh
index dbbc7150..16fd69da 100644
--- a/files/board/arpl/overlayfs/opt/arpl/include/i18n.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/i18n.sh
@@ -1,7 +1,6 @@
-
 if [ -f ${BOOTLOADER_PATH}/.locale ]; then
-  export LANG="`cat ${BOOTLOADER_PATH}/.locale`"
+  export LANG="$(cat ${BOOTLOADER_PATH}/.locale)"
 fi
 
 alias TEXT='gettext "arpl"'
-shopt -s expand_aliases
\ No newline at end of file
+shopt -s expand_aliases
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/modules.sh b/files/board/arpl/overlayfs/opt/arpl/include/modules.sh
index 9fc193eb..512cad3e 100644
--- a/files/board/arpl/overlayfs/opt/arpl/include/modules.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/include/modules.sh
@@ -1,4 +1,3 @@
-
 ###############################################################################
 # Return list of all modules available
 # 1 - Platform
@@ -11,10 +10,10 @@ function getAllModules() {
   mkdir -p "${TMP_PATH}/modules"
   tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
   # Get list of all modules
-  for F in `ls ${TMP_PATH}/modules/*.ko`; do
-    X=`basename ${F}`
+  for F in $(ls ${TMP_PATH}/modules/*.ko); do
+    X=$(basename ${F})
     M=${X:0:-3}
-    DESC=`modinfo ${F} | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}'`
+    DESC=$(modinfo ${F} | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}')
     [ -z "${DESC}" ] && DESC="${X}"
     echo "${M} \"${DESC}\""
   done
@@ -63,12 +62,12 @@ function delToModules() {
 function getdepends() {
   function _getdepends() {
     if [ -f "${TMP_PATH}/modules/${1}.ko" ]; then
-      depends=(`modinfo "${TMP_PATH}/modules/${1}.ko" | grep depends: | awk -F: '{print $2}' | awk '$1=$1' | sed 's/,/ /g'`)
+      depends=($(modinfo "${TMP_PATH}/modules/${1}.ko" | grep depends: | awk -F: '{print $2}' | awk '$1=$1' | sed 's/,/ /g'))
       if [ ${#depends[*]} -gt 0 ]; then
-          for k in ${depends[@]}; do 
-            echo "${k}"
-            _getdepends "${k}"
-          done
+        for k in ${depends[@]}; do
+          echo "${k}"
+          _getdepends "${k}"
+        done
       fi
     fi
   }
@@ -79,7 +78,7 @@ function getdepends() {
   rm -rf "${TMP_PATH}/modules"
   mkdir -p "${TMP_PATH}/modules"
   tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules"
-  DPS=(`_getdepends ${KONAME} | tr ' ' '\n' | sort -u`)
+  DPS=($(_getdepends ${KONAME} | tr ' ' '\n' | sort -u))
   echo ${DPS[@]}
   rm -rf "${TMP_PATH}/modules"
-}
\ No newline at end of file
+}