From 4dbfeb01ef313a159b6bf2d5299a3e886854d498 Mon Sep 17 00:00:00 2001
From: Ing <wjz304@qq.com>
Date: Tue, 15 Aug 2023 17:09:23 +0800
Subject: [PATCH] optimize somethings

---
 files/board/arpl/overlayfs/opt/arpl/boot.sh          |  5 ++++-
 files/board/arpl/overlayfs/opt/arpl/init.sh          |  8 +-------
 files/board/arpl/overlayfs/opt/arpl/menu.sh          | 12 ++++++------
 files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh |  3 ---
 4 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/files/board/arpl/overlayfs/opt/arpl/boot.sh b/files/board/arpl/overlayfs/opt/arpl/boot.sh
index 7642657b..e1a6e6ec 100755
--- a/files/board/arpl/overlayfs/opt/arpl/boot.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/boot.sh
@@ -43,7 +43,8 @@ fi
 
 # Check if DSM ramdisk changed, patch it if necessary
 RAMDISK_HASH="$(readConfigKey "ramdisk-hash" "${USER_CONFIG_FILE}")"
-if [ "$(sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}')" != "${RAMDISK_HASH}" ]; then
+RAMDISK_HASH_CUR="$(sha256sum "${ORI_RDGZ_FILE}" | awk '{print $1}')"
+if [ "${RAMDISK_HASH_CUR}" != "${RAMDISK_HASH}" ]; then
   echo -e "\033[1;43m$(TEXT "DSM Ramdisk changed")\033[0m"
   /opt/arpl/ramdisk-patch.sh
   if [ $? -ne 0 ]; then
@@ -51,6 +52,8 @@ if [ "$(sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}')" != "${RAMDISK_HASH}" ];
       --msgbox "$(TEXT "Ramdisk not patched:\n")$(<"${LOG_FILE}")" 12 70
     exit 1
   fi
+  # Update SHA256 hash
+  writeConfigKey "ramdisk-hash" "${RAMDISK_HASH_CUR}" "${USER_CONFIG_FILE}"
 fi
 
 # Load necessary variables
diff --git a/files/board/arpl/overlayfs/opt/arpl/init.sh b/files/board/arpl/overlayfs/opt/arpl/init.sh
index b1f635e8..8b90d865 100755
--- a/files/board/arpl/overlayfs/opt/arpl/init.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/init.sh
@@ -137,13 +137,7 @@ writeConfigKey "vid" ${VID} "${USER_CONFIG_FILE}"
 writeConfigKey "pid" ${PID} "${USER_CONFIG_FILE}"
 
 # Inform user
-echo -en "$(TEXT "Loader disk:") \033[1;32m${LOADER_DISK}\033[0m ("
-if [ "${BUS}" = "usb" ]; then
-  echo -en "\033[1;32m${BUS^^} flashdisk\033[0m"
-else
-  echo -en "\033[1;32m${BUS^^} DoM\033[0m"
-fi
-echo ")"
+echo -en "$(TEXT "Loader disk:") \033[1;32m${LOADER_DISK}\033[0m (\033[1;32m${BUS^^} flashdisk\033[0m)"
 
 # Check if partition 3 occupies all free space, resize if needed
 LOADER_DEVICE_NAME=$(echo ${LOADER_DISK} | sed 's|/dev/||')
diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
index b0a13813..d9159440 100755
--- a/files/board/arpl/overlayfs/opt/arpl/menu.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -1240,17 +1240,17 @@ function advancedMenu() {
       [ $? -ne 0 ] && return
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
         --infobox "$(TEXT "Saving ...")" 0 0
-      RDXZ_PATH=/tmp/rdxz_tmp
+      RDXZ_PATH=${TMP_PATH}/rdxz_tmp
       mkdir -p "${RDXZ_PATH}"
       (
         cd "${RDXZ_PATH}"
-        xz -dc <"${CACHE_PATH}/initrd-arpl" | cpio -idm
+        xz -dc <"${ARPL_RAMDISK_FILE}" | cpio -idm
       ) >/dev/null 2>&1 || true
       rm -rf "${RDXZ_PATH}/opt/arpl"
       cp -rf "/opt" "${RDXZ_PATH}/"
       (
         cd "${RDXZ_PATH}"
-        find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 >"${CACHE_PATH}/initrd-arpl"
+        find . 2>/dev/null | cpio -o -H newc -R root:root | xz --check=crc32 >"${ARPL_RAMDISK_FILE}"
       ) || true
       rm -rf "${RDXZ_PATH}"
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
@@ -1264,7 +1264,7 @@ function advancedMenu() {
       fi
       dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
         --msgbox "$(TEXT "Currently, only dts format files are supported. Please prepare and click to confirm uploading.\n(saved in /mnt/p3/users/)")" 0 0
-      TMP_UP_PATH=/tmp/users
+      TMP_UP_PATH=${TMP_PATH}/users
       rm -rf ${TMP_UP_PATH}
       mkdir -p ${TMP_UP_PATH}
       pushd ${TMP_UP_PATH}
@@ -1330,7 +1330,7 @@ function advancedMenu() {
         --yesno "$(TEXT "Please upload the backup file.\nCurrently, zip(github) and img.gz(backup) compressed file formats are supported.")" 0 0
       [ $? -ne 0 ] && return
       IFTOOL=""
-      TMP_UP_PATH=/tmp/users
+      TMP_UP_PATH=${TMP_PATH}/users
       rm -rf ${TMP_UP_PATH}
       mkdir -p ${TMP_UP_PATH}
       pushd ${TMP_UP_PATH}
@@ -1561,7 +1561,7 @@ function downloadExts() {
   fi
   dialog --backtitle "$(backtitle)" --colors --title "${T}" \
     --infobox "$(TEXT "Downloading last version")" 0 0
-  rm -f "/tmp/${4}.zip"
+  rm -f "${TMP_PATH}/${4}.zip"
   STATUS=$(curl -kL -w "%{http_code}" "${PROXY}${3}/releases/download/${TAG}/${4}.zip" -o "/tmp/${4}.zip")
   if [ $? -ne 0 -o ${STATUS} -ne 200 ]; then
     if [ ! "${5}" = "0" ]; then
diff --git a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
index cc78a46f..40cf9e24 100755
--- a/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
+++ b/files/board/arpl/overlayfs/opt/arpl/ramdisk-patch.sh
@@ -203,7 +203,4 @@ fi
 # Clean
 rm -rf "${RAMDISK_PATH}"
 
-# Update SHA256 hash
-RAMDISK_HASH="$(sha256sum ${ORI_RDGZ_FILE} | awk '{print$1}')"
-writeConfigKey "ramdisk-hash" "${RAMDISK_HASH}" "${USER_CONFIG_FILE}"
 echo