addons/update: fix

Signed-off-by: AuxXxilium <[email protected]>

Author: AuxXxilium

files/initrd/opt/arc/include/addons.sh

@@ -73,33 +73,13 @@ function installAddon() {
   return 0
 }
 
-###############################################################################
-# Untar an addon to correct path
-# 1 - Addon file path
-# Return name of addon on sucess or empty on error
-function untarAddon() {
-  if [ -z "${1}" ]; then
-    echo ""
-    return 1
-  fi
-  rm -rf "${TMP_PATH}/addon"
-  mkdir -p "${TMP_PATH}/addon"
-  tar -zxf "${1}" -C "${TMP_PATH}/addon" || return
-  local ADDON=$(readConfigKey "name" "${TMP_PATH}/addon/manifest.yml")
-  [ -z "${ADDON}" ] && return
-  rm -rf "${ADDONS_PATH}/${ADDON}"
-  mv -f "${TMP_PATH}/addon" "${ADDONS_PATH}/${ADDON}"
-  echo "${ADDON}"
-}
-
 ###############################################################################
 # Detect if has new local plugins to install/reinstall
 function updateAddon() {
   for F in $(ls ${ADDONS_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 -zxf "${F}" -C "${ADDONS_PATH}/${ADDON}"
     rm -f "${F}"
   done

files/initrd/opt/arc/include/update.sh

@@ -49,14 +49,14 @@ function updateLoader() {
         exec reboot
       fi
     fi
-    rm -rf "/mnt/update"
+    rm -rf "${TMP_PATH}/update"
     mkdir -p "${TMP_PATH}/update"
     dialog --backtitle "$(backtitle)" --title "Update Loader" \
       --infobox "Updating Loader..." 3 50
     if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
       rm -rf "/mnt/addons" "/mnt/modules" "/mnt/custom" "/mnt/patches" "/mnt/lkms"
       mkdir -p "/mnt/addons" "/mnt/modules" "/mnt/custom" "/mnt/patches" "/mnt/lkms"
-      cp -rf "${TMP_PATH}/update"/* "/mnt"
+      find "${TMP_PATH}/update" -mindepth 1 -maxdepth 1 -exec cp -rf {} "/mnt" \;
       rm -rf "${TMP_PATH}/update"
       rm -f "${TMP_PATH}/update.zip"
     fi
@@ -151,14 +151,14 @@ function updateLoaderBeta() {
         exec reboot
       fi
     fi
-    rm -rf "/mnt/update"
+    rm -rf "${TMP_PATH}/update"
     mkdir -p "${TMP_PATH}/update"
     dialog --backtitle "$(backtitle)" --title "Update Loader" \
       --infobox "Updating Loader..." 3 50
     if unzip -oq "${TMP_PATH}/update.zip" -d "${TMP_PATH}/update"; then
       rm -rf "/mnt/addons" "/mnt/modules" "/mnt/custom" "/mnt/patches" "/mnt/lkms"
       mkdir -p "/mnt/addons" "/mnt/modules" "/mnt/custom" "/mnt/patches" "/mnt/lkms"
-      cp -rf "${TMP_PATH}/update"/* "/mnt"
+      find "${TMP_PATH}/update" -mindepth 1 -maxdepth 1 -exec cp -rf {} "/mnt" \;
       rm -rf "${TMP_PATH}/update"
       rm -f "${TMP_PATH}/update.zip"
     fi
@@ -310,13 +310,7 @@ function updateAddons() {
       --infobox "Updating Addons..." 3 50
       if unzip -oq "${TMP_PATH}/addons.zip" -d "${ADDONS_PATH}"; then
         rm -f "${TMP_PATH}/addons.zip"
-        for F in "${ADDONS_PATH}"/*.addon; do
-          ADDON=$(basename "${F}" | sed 's|.addon||')
-          rm -rf "${ADDONS_PATH}/${ADDON}"
-          mkdir -p "${ADDONS_PATH}/${ADDON}"
-          tar -xaf "${F}" -C "${ADDONS_PATH}/${ADDON}"
-          rm -f "${F}"
-        done
+        updateAddon
         dialog --backtitle "$(backtitle)" --title "Update Addons" \
           --infobox "Update Addons successful!" 3 50
         sleep 2