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

fix SC2181

pull/162/head
IceCodeNew 2020-10-02 20:21:16 +08:00
parent 656fa81eb9
commit 50593bb31c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
install-release.sh
View File

@ -415,11 +415,11 @@ start_v2ray() {
stop_v2ray() { stop_v2ray() {
V2RAY_CUSTOMIZE="$(systemctl list-units | grep 'v2ray@' | awk -F ' ' '{print $1}')" V2RAY_CUSTOMIZE="$(systemctl list-units | grep 'v2ray@' | awk -F ' ' '{print $1}')"
if [[ -z "$V2RAY_CUSTOMIZE" ]]; then if [[ -z "$V2RAY_CUSTOMIZE" ]]; then
systemctl stop v2ray local v2ray_daemon_to_stop='v2ray.service'
else else
systemctl stop "$V2RAY_CUSTOMIZE" local v2ray_daemon_to_stop="$V2RAY_CUSTOMIZE"
fi fi
if [[ "$?" -ne '0' ]]; then if ! systemctl stop "$v2ray_daemon_to_stop"; then
echo 'error: Stopping the V2Ray service failed.' echo 'error: Stopping the V2Ray service failed.'
exit 1 exit 1
fi fi
@ -428,10 +428,11 @@ stop_v2ray() {
check_update() { check_update() {
if [[ -f '/etc/systemd/system/v2ray.service' ]]; then if [[ -f '/etc/systemd/system/v2ray.service' ]]; then
get_version (get_version)
if [[ "$?" -eq '0' ]]; then local get_ver_exit_code=$?
if [[ "$get_ver_exit_code" -eq '0' ]]; then
echo "info: Found the latest release of V2Ray $RELEASE_VERSION . (Current release: $CURRENT_VERSION)" echo "info: Found the latest release of V2Ray $RELEASE_VERSION . (Current release: $CURRENT_VERSION)"
elif [[ "$?" -eq '1' ]]; then elif [[ "$get_ver_exit_code" -eq '1' ]]; then
echo "info: No new version. The current version of V2Ray is $CURRENT_VERSION ." echo "info: No new version. The current version of V2Ray is $CURRENT_VERSION ."
fi fi
exit 0 exit 0
@ -446,14 +447,13 @@ remove_v2ray() {
if [[ -n "$(pidof v2ray)" ]]; then if [[ -n "$(pidof v2ray)" ]]; then
stop_v2ray stop_v2ray
fi fi
"rm" /usr/local/bin/v2ray if ! ("rm" -r '/usr/local/bin/v2ray' \
"rm" /usr/local/bin/v2ctl '/usr/local/bin/v2ctl' \
"rm" -r "$DAT_PATH" "$DAT_PATH" \
"rm" '/etc/systemd/system/v2ray.service' '/etc/systemd/system/v2ray.service' \
"rm" '/etc/systemd/system/v2ray@.service' '/etc/systemd/system/v2ray@.service' \
"rm" -r '/etc/systemd/system/v2ray.service.d' '/etc/systemd/system/v2ray.service.d' \
"rm" -r '/etc/systemd/system/v2ray@.service.d' '/etc/systemd/system/v2ray@.service.d'); then
if [[ "$?" -ne '0' ]]; then
echo 'error: Failed to remove V2Ray.' echo 'error: Failed to remove V2Ray.'
exit 1 exit 1
else else