lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-03 07:56:42 -05:00
Code Issues Releases Wiki Activity

use pgrep to detect if v2ray is running

Browse Source
This commit is contained in:
v2ray 2016-02-21 15:02:04 +01:00
parent 2de77000ad
commit e3dc449d44
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
release/install-release.sh
View File

@ -57,6 +57,11 @@ function install_component() {
fi fi
} }
V2RAY_RUNNING=0
if pgrep "v2ray" > /dev/null ; then
${V2RAY_RUNNING}=1
fi
VER="v1.7" VER="v1.7"
ARCH=$(uname -m) ARCH=$(uname -m)
@ -91,16 +96,15 @@ mkdir -p /var/log/v2ray
# Stop v2ray daemon if necessary. # Stop v2ray daemon if necessary.
SYSTEMCTL_CMD=$(command -v systemctl) SYSTEMCTL_CMD=$(command -v systemctl)
SERVICE_CMD=$(command -v service) SERVICE_CMD=$(command -v service)
ISRUN_CMD=$(ps x | grep -c v2ray)
if [ ${ISRUN_CMD} -eq 2 ]; then if [ ${V2RAY_RUNNING} -eq 1 ]; then
if [ -n "${SYSTEMCTL_CMD}" ]; then if [ -n "${SYSTEMCTL_CMD}" ]; then
if [ -f "/lib/systemd/system/v2ray.service" ]; then if [ -f "/lib/systemd/system/v2ray.service" ]; then
systemctl stop v2ray ${SYSTEMCTL_CMD} stop v2ray
fi fi
elif [ -n "${SERVICE_CMD}" ]; then elif [ -n "${SERVICE_CMD}" ]; then
if [ -f "/etc/init.d/v2ray" ]; then if [ -f "/etc/init.d/v2ray" ]; then
service v2ray stop ${SERVICE_CMD} v2ray stop
fi fi
fi fi
fi fi
@ -130,8 +134,8 @@ if [ -n "${SYSTEMCTL_CMD}" ]; then
cp "/tmp/v2ray/v2ray-${VER}-linux-${VDIS}/systemd/v2ray.service" "/lib/systemd/system/" cp "/tmp/v2ray/v2ray-${VER}-linux-${VDIS}/systemd/v2ray.service" "/lib/systemd/system/"
systemctl enable v2ray systemctl enable v2ray
else else
if [ ${ISRUN_CMD} -eq 2 ]; then if [ ${V2RAY_RUNNING} -eq 1 ]; then
systemctl start v2ray ${SYSTEMCTL_CMD} start v2ray
fi fi
fi fi
elif [ -n "${SERVICE_CMD}" ]; then # Configure SysV if necessary. elif [ -n "${SERVICE_CMD}" ]; then # Configure SysV if necessary.
@ -141,8 +145,8 @@ elif [ -n "${SERVICE_CMD}" ]; then # Configure SysV if necessary.
chmod +x "/etc/init.d/v2ray" chmod +x "/etc/init.d/v2ray"
update-rc.d v2ray defaults update-rc.d v2ray defaults
else else
if [ ${ISRUN_CMD} -eq 2 ]; then if [ ${V2RAY_RUNNING} -eq 1 ]; then
service v2ray start ${SERVICE_CMD} v2ray start
fi fi
fi fi
fi fi