Merge branch 'XTLS:main' into main

pull/102/head
Wiki Wang 2024-04-01 17:04:59 +08:00 committed by GitHub
commit 092abc5c44
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions

View File

@ -210,7 +210,7 @@ identify_the_operating_system_and_architecture() {
PACKAGE_MANAGEMENT_REMOVE='zypper remove'
package_provide_tput='ncurses-utils'
elif [[ "$(type -P pacman)" ]]; then
PACKAGE_MANAGEMENT_INSTALL='pacman -Syu --noconfirm'
PACKAGE_MANAGEMENT_INSTALL='pacman -Syy --noconfirm'
PACKAGE_MANAGEMENT_REMOVE='pacman -Rsn'
package_provide_tput='ncurses'
elif [[ "$(type -P emerge)" ]]; then
@ -300,6 +300,10 @@ judgment_parameters() {
N_UP_SERVICE='1'
;;
'--logrotate')
if grep -qE '\b([01][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]\b' <<< "$2";then
echo "error: Wrong format of time, it should be in the format of 12:34:56, under 12:00:00 should be start with 0, e.g. 01:23:45."
exit 1
fi
LOGROTATE='1'
LOGROTATE_TIME="$2"
shift
@ -801,7 +805,8 @@ show_help() {
echo " --no-update-service Don't change service files if they are exist"
echo " --without-geodata Don't install/update geoip.dat and geosite.dat"
echo " --without-logfiles Don't install /var/log/xray"
echo " --logrotate [time] Install with logrotate. [time] can be in the format of 12:34:56"
echo " --logrotate [time] Install with logrotate."
echo " [time] need be in the format of 12:34:56, under 12:00:00 should be start with 0, e.g. 01:23:45."
echo ' install-geodata:'
echo ' -p, --proxy Download through a proxy server'
echo ' remove:'