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

fix duplicate function names

Browse Source
This commit is contained in:
Ing 2024-03-11 02:38:12 +08:00
parent 7d702763c6
commit 5df48246d0
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/initrd/opt/rr/include/addons.sh
View File

@ -93,16 +93,3 @@ function untarAddon() {
mv -f "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}" mv -f "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}"
echo "${ADDON}" echo "${ADDON}"
} }
###############################################################################
# Detect if has new local plugins to install/reinstall
function updateAddons() {
for F in $(ls ${PART3_PATH}/*.addon 2>/dev/null); do
local ADDON=$(basename "${F}" | sed 's|.addon||')
rm -rf "${ADDONS_PATH}/${ADDON}"
mkdir -p "${ADDONS_PATH}/${ADDON}"
echo "Installing ${F} to ${ADDONS_PATH}/${ADDON}"
tar -xaf "${F}" -C "${ADDONS_PATH}/${ADDON}"
rm -f "${F}"
done
}

2
files/initrd/opt/rr/init.sh
View File

@ -201,5 +201,3 @@ mkdir -p "${CKS_PATH}"
mkdir -p "${LKMS_PATH}" mkdir -p "${LKMS_PATH}"
mkdir -p "${ADDONS_PATH}" mkdir -p "${ADDONS_PATH}"
mkdir -p "${MODULES_PATH}" mkdir -p "${MODULES_PATH}"
updateAddons

3
files/initrd/opt/rr/menu.sh
View File

@ -2587,7 +2587,7 @@ function updateAddons() {
rm -Rf "${ADDONS_PATH}/"* rm -Rf "${ADDONS_PATH}/"*
[ -f "${TMP_PATH}/update/VERSION" ] && cp -f "${TMP_PATH}/update/VERSION" "${ADDONS_PATH}/" [ -f "${TMP_PATH}/update/VERSION" ] && cp -f "${TMP_PATH}/update/VERSION" "${ADDONS_PATH}/"
for PKG in $(ls ${TMP_PATH}/update/*.addon 2>/dev/null); do for PKG in $(ls ${TMP_PATH}/update/*.addon 2>/dev/null); do
ADDON=$(basename ${PKG} | sed 's|.addon||') ADDON=$(basename ${PKG} .addon)
rm -rf "${ADDONS_PATH}/${ADDON}" rm -rf "${ADDONS_PATH}/${ADDON}"
mkdir -p "${ADDONS_PATH}/${ADDON}" mkdir -p "${ADDONS_PATH}/${ADDON}"
tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1
@ -2905,7 +2905,6 @@ if [ "${1}" = "update" ]; then
exit 0 exit 0
fi fi
if [ "${1}" = "boot" -a -n "${MODEL}" -a -n "${PRODUCTVER}" -a loaderIsConfigured ]; then if [ "${1}" = "boot" -a -n "${MODEL}" -a -n "${PRODUCTVER}" -a loaderIsConfigured ]; then
updateAddons
make make
boot && exit 0 || sleep 5 boot && exit 0 || sleep 5
fi fi