mirror of
https://github.com/RROrg/rr.git
synced 2025-06-21 05:51:05 +08:00
fix w output format caused by abnormal interruption
This commit is contained in:
parent
f791a8a241
commit
9f2f6e6096
@ -247,12 +247,12 @@ else
|
||||
done
|
||||
BOOTWAIT="$(readConfigKey "bootwait" "${USER_CONFIG_FILE}")"
|
||||
[ -z "${BOOTWAIT}" ] && BOOTWAIT=10
|
||||
w -h 2>/dev/null | awk '{print $1" "$2" "$3}' >WB
|
||||
w -h 2>/dev/null | grep -v tty1 | awk '{print $1" "$2" "$3}' >WB
|
||||
MSG=""
|
||||
while test ${BOOTWAIT} -ge 0; do
|
||||
MSG="$(printf "\033[1;33m$(TEXT "%2ds (Changing access(ssh/web) status will interrupt boot)")\033[0m" "${BOOTWAIT}")"
|
||||
echo -en "\r${MSG}"
|
||||
w -h 2>/dev/null | awk '{print $1" "$2" "$3}' >WC
|
||||
w -h 2>/dev/null | grep -v tty1 | awk '{print $1" "$2" "$3}' >WC
|
||||
if ! diff WB WC >/dev/null 2>&1; then
|
||||
echo -en "\r\033[1;33m$(TEXT "access(ssh/web) status has changed and booting is interrupted.")\033[0m\n"
|
||||
rm -f WB WC
|
||||
|
Loading…
x
Reference in New Issue
Block a user