black-internet-days-ahead/Xray-install
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-install.git synced 2024-11-23 23:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from kirin10000/dev

Browse source
This commit is contained in:
kirin10000 2021-03-27 20:25:39 +08:00 committed by JimhHan
parent ae6cede95a
commit b3702bdd56
No known key found for this signature in database
GPG key ID: 48D5D7CF95157AC5
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
install-release.sh
View file

@ -28,6 +28,12 @@ JSON_PATH=${JSON_PATH:-/usr/local/etc/xray}
# Gobal verbals # Gobal verbals
if [[ -f '/etc/systemd/system/xray.service' ]] && [[ -f '/usr/local/bin/xray' ]]; then
XRAY_IS_INSTALLED_BEFORE_RUNNING_SCRIPT=1
else
XRAY_IS_INSTALLED_BEFORE_RUNNING_SCRIPT=0
fi
# Xray current version # Xray current version
CURRENT_VERSION='' CURRENT_VERSION=''
@ -660,7 +666,7 @@ install_geodata() {
local file_site='geosite.dat' local file_site='geosite.dat'
local dir_tmp local dir_tmp
dir_tmp="$(mktemp -d)" dir_tmp="$(mktemp -d)"
[[ ! -f '/usr/local/bin/xray' ]] && echo "warning: Xray was not installed" [[ "$XRAY_IS_INSTALLED_BEFORE_RUNNING_SCRIPT" -eq '0' ]] && echo "warning: Xray was not installed"
download_geodata $download_link_geoip $file_ip download_geodata $download_link_geoip $file_ip
download_geodata $download_link_geosite $file_dlc download_geodata $download_link_geosite $file_dlc
cd "${dir_tmp}" || exit cd "${dir_tmp}" || exit
@ -679,7 +685,7 @@ install_geodata() {
} }
check_update() { check_update() {
if [[ -f '/etc/systemd/system/xray.service' ]]; then if [[ "$XRAY_IS_INSTALLED_BEFORE_RUNNING_SCRIPT" -eq '1' ]]; then
get_current_version get_current_version
echo "info: The current version of Xray is $CURRENT_VERSION ." echo "info: The current version of Xray is $CURRENT_VERSION ."
else else
@ -883,10 +889,11 @@ main() {
get_current_version get_current_version
echo "info: Xray $CURRENT_VERSION is installed." echo "info: Xray $CURRENT_VERSION is installed."
echo "You may need to execute a command to remove dependent software: $PACKAGE_MANAGEMENT_REMOVE curl unzip" echo "You may need to execute a command to remove dependent software: $PACKAGE_MANAGEMENT_REMOVE curl unzip"
if [[ "$XRAY_RUNNING" -eq '1' ]]; then if [[ "$XRAY_IS_INSTALLED_BEFORE_RUNNING_SCRIPT" -eq '1' ]] && [[ "$FORCE" -eq '0' ]] && [[ "$REINSTALL" -eq '0' ]]; then
start_xray [[ "$XRAY_RUNNING" -eq '1' ]] && start_xray
else else
systemctl --now enable xray systemctl start xray
systemctl enable xray
sleep 1s sleep 1s
if systemctl -q is-active xray; then if systemctl -q is-active xray; then
echo "info: Enable and start the Xray service" echo "info: Enable and start the Xray service"