Explorar el Código

revert config file path change

Darien Raymond hace 7 años
padre
commit
ed68902e9f

+ 1 - 2
release/BUILD

@@ -15,7 +15,7 @@ filegroup(
 
 filegroup(
   name = "systemd",
-  srcs = ["config/systemd_v2ray.service", "config/systemv_v2ray"],
+  srcs = ["config/systemd/v2ray.service", "config/systemv/v2ray"],
 )
 
 filegroup(
@@ -85,7 +85,6 @@ pkg_zip(
     ":config_all",
     ":systemd",
     ":doc",
-    ":geodata",
   ],
   out = "v2ray-linux-64.zip",
 )

+ 0 - 0
release/config/systemd_v2ray.service → release/config/systemd/v2ray.service


+ 0 - 0
release/config/systemv_v2ray → release/config/systemv/v2ray


+ 2 - 8
release/install-release.sh

@@ -269,23 +269,17 @@ installV2Ray(){
 
 
 installInitScript(){
-    if [[ -f "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemd/v2ray.service" ]]; then
-        cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemd/v2ray.service" "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemd_v2ray.service"
-    fi
-    if [[ -f "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemv/v2ray" ]]; then
-        cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemv/v2ray" "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemv_v2ray"
-    fi
     if [[ -n "${SYSTEMCTL_CMD}" ]];then
         if [[ ! -f "/etc/systemd/system/v2ray.service" ]]; then
             if [[ ! -f "/lib/systemd/system/v2ray.service" ]]; then
-                cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemd_v2ray.service" "/etc/systemd/system/"
+                cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemd/v2ray.service" "/etc/systemd/system/"
                 systemctl enable v2ray.service
             fi
         fi
         return
     elif [[ -n "${SERVICE_CMD}" ]] && [[ ! -f "/etc/init.d/v2ray" ]]; then
         installSoftware "daemon" || return $?
-        cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemv_v2ray" "/etc/init.d/v2ray"
+        cp "/tmp/v2ray/v2ray-${NEW_VER}-linux-${VDIS}/systemv/v2ray" "/etc/init.d/v2ray"
         chmod +x "/etc/init.d/v2ray"
         update-rc.d v2ray defaults
     fi