浏览代码

fix: v2.1.0

jonssonyan 2 年之前
父节点
当前提交
8542e89d47
共有 2 个文件被更改,包括 14 次插入8 次删除
  1. 7 4
      archive/install_script_v2.1.0.sh
  2. 7 4
      install_script.sh

+ 7 - 4
archive/install_script_v2.1.0.sh

@@ -1176,7 +1176,8 @@ update__trojan_panel_database() {
   fi
   version_205_210=("v2.0.5")
   if [[ "${version_205_210[*]}" =~ "${trojan_panel_current_version}" ]]; then
-    if [[ -d "${TP_DATA}" && ! -f "${DOMAIN_FILE}" ]]; then
+    domain=$(cat "${DOMAIN_FILE}")
+    if [[ -z "${domain}" ]]; then
       uninstall_caddy_tls
       install_reverse_proxy
     fi
@@ -1193,9 +1194,11 @@ update__trojan_panel_core_database() {
 
   version_204_210=("v2.0.4")
   if [[ "${version_204_210[*]}" =~ "${trojan_panel_core_current_version}" ]]; then
-    cp -r /tpdata/caddy/srv/* ${WEB_PATH}
-    cp -r /tpdata/caddy/cert/* ${CERT_PATH}
-    cp /tpdata/caddy/domain.lock ${DOMAIN_FILE}
+    domain=$(cat "${DOMAIN_FILE}")
+    if [[ -z "${domain}" ]]; then
+      uninstall_caddy_tls
+      install_reverse_proxy
+    fi
     trojan_panel_core_current_version="v2.1.0"
   fi
 

+ 7 - 4
install_script.sh

@@ -1176,7 +1176,8 @@ update__trojan_panel_database() {
   fi
   version_205_210=("v2.0.5")
   if [[ "${version_205_210[*]}" =~ "${trojan_panel_current_version}" ]]; then
-    if [[ -d "${TP_DATA}" && ! -f "${DOMAIN_FILE}" ]]; then
+    domain=$(cat "${DOMAIN_FILE}")
+    if [[ -z "${domain}" ]]; then
       uninstall_caddy_tls
       install_reverse_proxy
     fi
@@ -1193,9 +1194,11 @@ update__trojan_panel_core_database() {
 
   version_204_210=("v2.0.4")
   if [[ "${version_204_210[*]}" =~ "${trojan_panel_core_current_version}" ]]; then
-    cp -r /tpdata/caddy/srv/* ${WEB_PATH}
-    cp -r /tpdata/caddy/cert/* ${CERT_PATH}
-    cp /tpdata/caddy/domain.lock ${DOMAIN_FILE}
+    domain=$(cat "${DOMAIN_FILE}")
+    if [[ -z "${domain}" ]]; then
+      uninstall_caddy_tls
+      install_reverse_proxy
+    fi
     trojan_panel_core_current_version="v2.1.0"
   fi