From 891cba48ed39533d5cc8bffc65d3bc0c9cf24857 Mon Sep 17 00:00:00 2001 From: sunshineplan Date: Sat, 14 Apr 2018 15:34:59 +0800 Subject: [PATCH] Update install-release.sh --- release/install-release.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/release/install-release.sh b/release/install-release.sh index 42f6019fd..e1a812ce6 100755 --- a/release/install-release.sh +++ b/release/install-release.sh @@ -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="" @@ -186,9 +189,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 @@ -203,9 +203,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 @@ -267,9 +264,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 @@ -300,8 +294,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