Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for travis on Ubuntu focal

Browse Source
This commit is contained in:
VirtuBox
2020-10-15 13:40:17 +02:00
parent 5b6fbe278b
commit 43cd78ebc6
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/travis.sh
View File

@@ -13,6 +13,7 @@ export DEBIAN_FRONTEND=noninteractive
unset LANG unset LANG
export LANG='en_US.UTF-8' export LANG='en_US.UTF-8'
export LC_ALL='C.UTF-8' export LC_ALL='C.UTF-8'
wo_distro=$(lsb_release -sc)
if [ -z "$1" ]; then if [ -z "$1" ]; then
{ {
@@ -259,29 +260,31 @@ else
exit_script exit_script
fi fi
echo -ne " wo secure --sshport [..]\r" if [ "$wo_distro" != "focal" ]; then
if { echo -ne " wo secure --sshport [..]\r"
wo secure --sshport 2022 if {
} >>/var/log/wo/test.log; then wo secure --sshport 2022
echo -ne " wo secure --sshport [${CGREEN}OK${CEND}]\\r" } >>/var/log/wo/test.log; then
echo -ne '\n' echo -ne " wo secure --sshport [${CGREEN}OK${CEND}]\\r"
else echo -ne '\n'
echo -e " wo secure --sshport [${CRED}FAIL${CEND}]" else
echo -ne '\n' echo -e " wo secure --sshport [${CRED}FAIL${CEND}]"
exit_script echo -ne '\n'
exit_script
fi fi
echo -ne " wo secure --ssh [..]\r" echo -ne " wo secure --ssh [..]\r"
if { if {
wo secure --ssh --force wo secure --ssh --force
} >>/var/log/wo/test.log; then } >>/var/log/wo/test.log; then
echo -ne " wo secure --ssh [${CGREEN}OK${CEND}]\\r" echo -ne " wo secure --ssh [${CGREEN}OK${CEND}]\\r"
echo -ne '\n' echo -ne '\n'
else else
echo -e " wo secure --ssh [${CRED}FAIL${CEND}]" echo -e " wo secure --ssh [${CRED}FAIL${CEND}]"
echo -ne '\n' echo -ne '\n'
exit_script exit_script
fi
fi fi
echo -ne " wo secure --port [..]\r" echo -ne " wo secure --port [..]\r"
if { if {