Update：Toolbox v6.0

Fix：Module integration lost file repository.
MoGuangYu · Aug 8, 2024 · d9ca9c2 · d9ca9c2
1 parent 3ec25e2
commit d9ca9c2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/box_bll/clash/Toolbox.sh b/box_bll/clash/Toolbox.sh
@@ -41,7 +41,7 @@ GIT_URL="https://api.github.com/repos/MoGuangYu/Surfing/releases/latest"
 RULES_URL_PREFIX="https://raw.githubusercontent.com/MoGuangYu/rules/main/Home/"
 RULES=("YouTube.yaml" "TikTok.yaml" "Telegram.yaml" "OpenAI.yaml" "Netflix.yaml" "Microsoft.yaml" "Google.yaml" "Facebook.yaml" "Discord.yaml" "Apple.yaml")
 
-CURRENT_VERSION="v5.0"
+CURRENT_VERSION="v6.0"
 TOOLBOX_URL="https://raw.githubusercontent.com/MoGuangYu/Surfing/main/box_bll/clash/Toolbox.sh"
 TOOLBOX_FILE="/data/adb/box_bll/clash/Toolbox.sh"
 get_remote_version() {
@@ -91,7 +91,7 @@ check_version
 show_menu() {
     while true; do
         echo "=========="
-        echo "v5.0" 
+        echo "v6.0" 
         echo "Menu Bar："
         echo "1. 重载配置"
         echo "2. 清空数据库缓存"
@@ -263,14 +263,23 @@ integrate_magisk_update() {
     fi
     echo "↴"
     echo "正在检测当前状态..."
-        for i in 1
+    for i in 1
     do
         sleep 1
     done
+    VARIAB_PATH="$SURFING_PATH/variab"
+    TEMP_PATH="/data/local/tmp/Surfing_variab_backup"
     if [ -d "$GXSURFING_PATH" ]; then
         echo "检测到 安装/更新 Surfing 模块，进行整合..."
+        if [ -d "$VARIAB_PATH" ]; then
+            mv "$VARIAB_PATH" "$TEMP_PATH"
+        fi
         rm -rf "$SURFING_PATH"
         mv "$GXSURFING_PATH" /data/adb/modules/
+        if [ -d "$TEMP_PATH" ]; then
+            mv "$TEMP_PATH" "$SURFING_PATH/variab"
+            rm -rf "$TEMP_PATH"
+        fi
         if [ -f "$SURFING_PATH/update" ]; then
             rm -f "$SURFING_PATH/update"
         fi