lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-09-27 22:36:12 -04:00
Code Issues Releases Wiki Activity

Merge pull request #1056 from sunshineplan/sunshineplan-patch-3

Browse Source 
install-release.sh合并重复变量定义并置于开头
This commit is contained in:
DarienRaymond 2018-04-14 09:39:20 +02:00 committed by GitHub
commit 5dd259fec7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
release/install-release.sh
View File

@ -20,6 +20,9 @@ CMD_INSTALL=""
CMD_UPDATE=""
SOFTWARE_UPDATED=0
SYSTEMCTL_CMD=$(command -v systemctl 2>/dev/null)
SERVICE_CMD=$(command -v service 2>/dev/null)
CHECK=""
FORCE=""
HELP=""
@ -185,9 +188,6 @@ getVersion(){
}
stopV2ray(){
SYSTEMCTL_CMD=$(command -v systemctl)
SERVICE_CMD=$(command -v service)
colorEcho ${BLUE} "Shutting down V2Ray service."
if [[ -n "${SYSTEMCTL_CMD}" ]] || [[ -f "/lib/systemd/system/v2ray.service" ]] || [[ -f "/etc/systemd/system/v2ray.service" ]]; then
${SYSTEMCTL_CMD} stop v2ray
@ -202,9 +202,6 @@ stopV2ray(){
}
startV2ray(){
SYSTEMCTL_CMD=$(command -v systemctl)
SERVICE_CMD=$(command -v service)
if [ -n "${SYSTEMCTL_CMD}" ] && [ -f "/lib/systemd/system/v2ray.service" ]; then
${SYSTEMCTL_CMD} start v2ray
elif [ -n "${SYSTEMCTL_CMD}" ] && [ -f "/etc/systemd/system/v2ray.service" ]; then
@ -266,9 +263,6 @@ installV2Ray(){
installInitScript(){
SYSTEMCTL_CMD=$(command -v systemctl)
SERVICE_CMD=$(command -v service)
if [[ -n "${SYSTEMCTL_CMD}" ]];then
if [[ ! -f "/etc/systemd/system/v2ray.service" ]]; then
if [[ ! -f "/lib/systemd/system/v2ray.service" ]]; then
@ -299,8 +293,6 @@ Help(){
}
remove(){
SYSTEMCTL_CMD=$(command -v systemctl)
SERVICE_CMD=$(command -v service)
if [[ -n "${SYSTEMCTL_CMD}" ]] && [[ -f "/etc/systemd/system/v2ray.service" ]];then
if pgrep "v2ray" > /dev/null ; then
stopV2ray