From 43cd78ebc682d77f9b34af496985e3d785a08f75 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Thu, 15 Oct 2020 13:40:17 +0200 Subject: [PATCH] Fix for travis on Ubuntu focal --- tests/travis.sh | 45 ++++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/tests/travis.sh b/tests/travis.sh index 742d80f..1919cdb 100644 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -13,6 +13,7 @@ export DEBIAN_FRONTEND=noninteractive unset LANG export LANG='en_US.UTF-8' export LC_ALL='C.UTF-8' +wo_distro=$(lsb_release -sc) if [ -z "$1" ]; then { @@ -259,29 +260,31 @@ else exit_script fi -echo -ne " wo secure --sshport [..]\r" -if { - wo secure --sshport 2022 -} >>/var/log/wo/test.log; then - echo -ne " wo secure --sshport [${CGREEN}OK${CEND}]\\r" - echo -ne '\n' -else - echo -e " wo secure --sshport [${CRED}FAIL${CEND}]" - echo -ne '\n' - exit_script +if [ "$wo_distro" != "focal" ]; then + echo -ne " wo secure --sshport [..]\r" + if { + wo secure --sshport 2022 + } >>/var/log/wo/test.log; then + echo -ne " wo secure --sshport [${CGREEN}OK${CEND}]\\r" + echo -ne '\n' + else + echo -e " wo secure --sshport [${CRED}FAIL${CEND}]" + echo -ne '\n' + exit_script -fi -echo -ne " wo secure --ssh [..]\r" -if { - wo secure --ssh --force -} >>/var/log/wo/test.log; then - echo -ne " wo secure --ssh [${CGREEN}OK${CEND}]\\r" - echo -ne '\n' -else - echo -e " wo secure --ssh [${CRED}FAIL${CEND}]" - echo -ne '\n' - exit_script + fi + echo -ne " wo secure --ssh [..]\r" + if { + wo secure --ssh --force + } >>/var/log/wo/test.log; then + echo -ne " wo secure --ssh [${CGREEN}OK${CEND}]\\r" + echo -ne '\n' + else + echo -e " wo secure --ssh [${CRED}FAIL${CEND}]" + echo -ne '\n' + exit_script + fi fi echo -ne " wo secure --port [..]\r" if {