GuanM/hysteria-dev
1
0
Fork 0
mirror of https://github.com/cmz0228/hysteria-dev.git synced 2025-06-10 14:29:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(install_server.sh): centos 7 supports

Browse Source 
there is no systemd-sysusers on centos 7, and
its bash does not support $(("1" - "2"))
This commit is contained in:
Haruue Icymoon 2022-11-28 15:15:34 +08:00
parent 608810ceac
commit dbe9f3414c
No known key found for this signature in database
GPG Key ID: F6083B28CBCBC148
1 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
install_server.sh
View File

@ -25,8 +25,6 @@ EXECUTABLE_INSTALL_PATH="/usr/local/bin/hysteria"
# Paths to install systemd files # Paths to install systemd files
SYSTEMD_SERVICES_DIR="/etc/systemd/system" SYSTEMD_SERVICES_DIR="/etc/systemd/system"
SYSTEMD_SYSUSERS_DIR="/etc/sysusers.d"
SYSTEMD_TMPFILES_DIR="/etc/tmpfiles.d"
# Directory to store hysteria config file # Directory to store hysteria config file
CONFIG_DIR="/etc/hysteria" CONFIG_DIR="/etc/hysteria"
@ -157,24 +155,6 @@ systemctl() {
command systemctl "$@" command systemctl "$@"
} }
systemd-sysusers() {
if [[ "x$FORCE_NO_SYSTEMD" == "x2" ]] || ! has_command systemd-sysusers; then
warning "Ignored systemd command: systemd-sysusers $@"
return
fi
command systemd-sysusers "$@"
}
systemd-tmpfiles() {
if [[ "x$FORCE_NO_SYSTEMD" == "x2" ]] || ! has_command systemd-tmpfiles; then
warning "Ignored systemd command: systemd-tmpfiles $@"
return
fi
command systemd-tmpfiles "$@"
}
show_argument_error_and_exit() { show_argument_error_and_exit() {
local _error_msg="$1" local _error_msg="$1"
@ -409,7 +389,7 @@ vercmp_segment() {
echo 1 echo 1
return return
fi fi
local _numcmp=$(("$_lhs_num" - "$_rhs_num")) local _numcmp=$(($_lhs_num - $_rhs_num))
if [[ "$_numcmp" -ne 0 ]]; then if [[ "$_numcmp" -ne 0 ]]; then
echo "$_numcmp" echo "$_numcmp"
return return
@ -626,20 +606,6 @@ tpl_etc_hysteria_config_json() {
EOF EOF
} }
# /etc/sysusers.d/hysteria.conf
tpl_sysusers_conf() {
cat << EOF
u $HYSTERIA_USER - "Hysteria" $HYSTERIA_HOME_DIR
EOF
}
# /etc/tmpfiles.d/hysteria.conf
tpl_tmpfiles_conf() {
cat << EOF
d $HYSTERIA_HOME_DIR 0750 $HYSTERIA_USER $HYSTERIA_USER
EOF
}
### ###
# SYSTEMD # SYSTEMD
@ -820,21 +786,19 @@ perform_install_hysteria_example_config() {
} }
perform_install_hysteria_systemd() { perform_install_hysteria_systemd() {
if [[ "x$FORCE_NO_SYSTEMD" == "x2" ]]; then
return
fi
install_content -Dm644 "$(tpl_hysteria_server_service)" "$SYSTEMD_SERVICES_DIR/hysteria-server.service" install_content -Dm644 "$(tpl_hysteria_server_service)" "$SYSTEMD_SERVICES_DIR/hysteria-server.service"
install_content -Dm644 "$(tpl_hysteria_server_x_service)" "$SYSTEMD_SERVICES_DIR/hysteria-server@.service" install_content -Dm644 "$(tpl_hysteria_server_x_service)" "$SYSTEMD_SERVICES_DIR/hysteria-server@.service"
install_content -Dm644 "$(tpl_sysusers_conf)" "$SYSTEMD_SYSUSERS_DIR/hysteria.conf"
install_content -Dm644 "$(tpl_tmpfiles_conf)" "$SYSTEMD_TMPFILES_DIR/hysteria.conf"
systemctl daemon-reload systemctl daemon-reload
systemd-sysusers
systemd-tmpfiles --create
} }
perform_remove_hysteria_systemd() { perform_remove_hysteria_systemd() {
remove_file "$SYSTEMD_SERVICES_DIR/hysteria-server.service" remove_file "$SYSTEMD_SERVICES_DIR/hysteria-server.service"
remove_file "$SYSTEMD_SERVICES_DIR/hysteria-server@.service" remove_file "$SYSTEMD_SERVICES_DIR/hysteria-server@.service"
remove_file "$SYSTEMD_SYSUSERS_DIR/hysteria.conf"
remove_file "$SYSTEMD_TMPFILES_DIR/hysteria.conf"
systemctl daemon-reload systemctl daemon-reload
} }
@ -873,12 +837,8 @@ perform_install() {
perform_install_hysteria_binary perform_install_hysteria_binary
perform_install_hysteria_example_config perform_install_hysteria_example_config
if [[ "x$FORCE_NO_SYSTEMD" == "x2" ]]; then
perform_install_hysteria_home_legacy perform_install_hysteria_home_legacy
else
perform_install_hysteria_systemd perform_install_hysteria_systemd
fi
if [[ -n "$_is_frash_install" ]]; then if [[ -n "$_is_frash_install" ]]; then
echo echo