From 5df48246d0eea52f035bd306fd0c2742986d1a0a Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Mon, 11 Mar 2024 02:38:12 +0800
Subject: [PATCH] fix duplicate function names

---
 files/initrd/opt/rr/include/addons.sh | 13 -------------
 files/initrd/opt/rr/init.sh           |  2 --
 files/initrd/opt/rr/menu.sh           |  3 +--
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/files/initrd/opt/rr/include/addons.sh b/files/initrd/opt/rr/include/addons.sh
index 51b44588..10a88b05 100755
--- a/files/initrd/opt/rr/include/addons.sh
+++ b/files/initrd/opt/rr/include/addons.sh
@@ -93,16 +93,3 @@ function untarAddon() {
   mv -f "${TMP_PATH}/addon" "${ADDONS_PATH}/${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
-}
diff --git a/files/initrd/opt/rr/init.sh b/files/initrd/opt/rr/init.sh
index b5365808..abb47d38 100755
--- a/files/initrd/opt/rr/init.sh
+++ b/files/initrd/opt/rr/init.sh
@@ -201,5 +201,3 @@ mkdir -p "${CKS_PATH}"
 mkdir -p "${LKMS_PATH}"
 mkdir -p "${ADDONS_PATH}"
 mkdir -p "${MODULES_PATH}"
-
-updateAddons
diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh
index a08fe47b..15bfeb51 100755
--- a/files/initrd/opt/rr/menu.sh
+++ b/files/initrd/opt/rr/menu.sh
@@ -2587,7 +2587,7 @@ function updateAddons() {
   rm -Rf "${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
-    ADDON=$(basename ${PKG} | sed 's|.addon||')
+    ADDON=$(basename ${PKG} .addon)
     rm -rf "${ADDONS_PATH}/${ADDON}"
     mkdir -p "${ADDONS_PATH}/${ADDON}"
     tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1
@@ -2905,7 +2905,6 @@ if [ "${1}" = "update" ]; then
   exit 0
 fi
 if [ "${1}" = "boot" -a -n "${MODEL}" -a -n "${PRODUCTVER}" -a loaderIsConfigured ]; then
-  updateAddons
   make
   boot && exit 0 || sleep 5
 fi