yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
Ing 2023-06-23 16:35:29 +08:00
parent e873c671ed
commit 1793b0f082
6 changed files with 36 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
files/board/arpl/overlayfs/opt/arpl/include/addons.sh
View File

@ -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}"

3
files/board/arpl/overlayfs/opt/arpl/include/configFile.sh
View File

@ -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}
}

1
files/board/arpl/overlayfs/opt/arpl/include/consts.sh
View File

@ -1,4 +1,3 @@
ARPL_VERSION="23.6.6"
ARPL_TITLE="ARPL-i18n v${ARPL_VERSION}"

14
files/board/arpl/overlayfs/opt/arpl/include/functions.sh
View File

@ -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
@ -90,9 +90,9 @@ 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
SERIAL="$(readModelArray "${1}" "serial.prefix" | sort -R | tail -1)"
SERIAL+=$(readModelKey "${1}" "serial.middle")
case "$(readModelKey "${1}" "serial.suffix")" in
numeric)
SERIAL+=$(random)
;;
@ -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

3
files/board/arpl/overlayfs/opt/arpl/include/i18n.sh
View File

@ -1,6 +1,5 @@
if [ -f ${BOOTLOADER_PATH}/.locale ]; then
export LANG="`cat ${BOOTLOADER_PATH}/.locale`"
export LANG="$(cat ${BOOTLOADER_PATH}/.locale)"
fi
alias TEXT='gettext "arpl"'

11
files/board/arpl/overlayfs/opt/arpl/include/modules.sh
View File

@ -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,7 +62,7 @@ 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}"
@ -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"
}