github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

revert config file path change

pull/1313/head^2
Darien Raymond 2018-10-04 10:00:38 +02:00
parent 7be96a1629
commit ed68902e9f
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/BUILD
View File

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

0
release/config/systemd_v2ray.service → release/config/systemd/v2ray.service
View File

0
release/config/systemv_v2ray → release/config/systemv/v2ray
View File

10
release/install-release.sh
View File

@ -269,23 +269,17 @@ installV2Ray(){
installInitScript(){ 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 [[ -n "${SYSTEMCTL_CMD}" ]];then
if [[ ! -f "/etc/systemd/system/v2ray.service" ]]; then if [[ ! -f "/etc/systemd/system/v2ray.service" ]]; then
if [[ ! -f "/lib/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 systemctl enable v2ray.service
fi fi
fi fi
return return
elif [[ -n "${SERVICE_CMD}" ]] && [[ ! -f "/etc/init.d/v2ray" ]]; then elif [[ -n "${SERVICE_CMD}" ]] && [[ ! -f "/etc/init.d/v2ray" ]]; then
installSoftware "daemon" || return $? 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" chmod +x "/etc/init.d/v2ray"
update-rc.d v2ray defaults update-rc.d v2ray defaults
fi fi