Merge remote-tracking branch 'upstream/main'

pull/102/head
W 2024-07-18 16:04:05 +08:00
commit 43fb4fe3fc
No known key found for this signature in database
GPG Key ID: CA4B4555280A26A5
1 changed files with 3 additions and 3 deletions

View File

@ -300,8 +300,8 @@ 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."
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 10:00:00 should be start with 0, e.g. 01:23:45."
exit 1
fi
LOGROTATE='1'
@ -806,7 +806,7 @@ show_help() {
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."
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 " [time] need be in the format of 12:34:56, under 10: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:'