From ed68902e9f24ce04bd22cb12db747118673844b1 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Thu, 4 Oct 2018 10:00:38 +0200
Subject: [PATCH] revert config file path change

---
 release/BUILD                                          |  3 +--
 .../{systemd_v2ray.service => systemd/v2ray.service}   |  0
 release/config/{systemv_v2ray => systemv/v2ray}        |  0
 release/install-release.sh                             | 10 ++--------
 4 files changed, 3 insertions(+), 10 deletions(-)
 rename release/config/{systemd_v2ray.service => systemd/v2ray.service} (100%)
 rename release/config/{systemv_v2ray => systemv/v2ray} (100%)

diff --git a/release/BUILD b/release/BUILD
index c6009071..84e42e02 100644
--- a/release/BUILD
+++ b/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",
 )
diff --git a/release/config/systemd_v2ray.service b/release/config/systemd/v2ray.service
similarity index 100%
rename from release/config/systemd_v2ray.service
rename to release/config/systemd/v2ray.service
diff --git a/release/config/systemv_v2ray b/release/config/systemv/v2ray
similarity index 100%
rename from release/config/systemv_v2ray
rename to release/config/systemv/v2ray
diff --git a/release/install-release.sh b/release/install-release.sh
index b8957a50..bc1446bf 100755
--- a/release/install-release.sh
+++ b/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