Dew-OF-Aurora 3 недель назад
Родитель
Сommit
eda833bb2d
2 измененных файлов с 7 добавлено и 2 удалено
  1. 6 1
      scripts/run_update_and_commit.sh
  2. 1 1
      substore/operator_template.js

+ 6 - 1
scripts/run_update_and_commit.sh

@@ -170,9 +170,14 @@ fi
 
 if [[ "$cleanup_worktree" == "1" ]]; then
   cleanup() {
-    git -C "$APP_DIR" worktree remove --force "$work_dir" >/dev/null 2>&1 || rm -rf "$work_dir"
+    trap - EXIT INT TERM
+    git -C "$APP_DIR" worktree remove --force "$work_dir" >/dev/null 2>&1 || {
+      rm -rf "$work_dir"
+      git -C "$APP_DIR" worktree prune >/dev/null 2>&1 || true
+    }
   }
   trap cleanup EXIT
+  trap 'cleanup; exit 1' INT TERM
 fi
 
 work_branch="$(git -C "$work_dir" symbolic-ref --quiet --short HEAD 2>/dev/null || true)"

+ 1 - 1
substore/operator_template.js

@@ -7,7 +7,7 @@
 const ROUTER_VALUE_JSON_URL = "http://192.168.50.1:8080/current_ip.json";
 const SERVER_VALUE_JSON_URL = "https://git.dewofaurora.de/aurora/vmess-domain-rotator/raw/runtime-state/runtime/current_domain.json";
 const ROUTER_MIN_SPEED_MB_PER_S = 5;
-const VALUE_SOURCE_MODE = "default"; // default | server_only | router_only
+const VALUE_SOURCE_MODE = "server_only"; // default | server_only | router_only
 
 const NODE_NAME_REGEX = /(argo|cf|vm|优选)/i;
 const CACHE_KEY = `vmess-domain-rotator:${VALUE_SOURCE_MODE}`;