diff --git a/util/install.sh b/util/install.sh index 0a67871..7076dbe 100755 --- a/util/install.sh +++ b/util/install.sh @@ -5,6 +5,7 @@ # Fail on error set -e +set -x # Fail on unset var usage set -o nounset @@ -174,15 +175,16 @@ function mn_deps { python-pep8 ${PYPKG}-pexpect ${PYPKG}-tk else # Debian/Ubuntu pf=pyflakes - # Starting around 20.04, installing pyflakes instead of pyflakes3 + # Starting around 18.04, installing pyflakes instead of pyflakes3 # causes Python 2 to be installed, which is exactly NOT what we want. - if [ `expr $RELEASE '>=' 20.04` = "1" ]; then + if [ `expr $RELEASE '>=' 18.04` = "1" ]; then pf=pyflakes3 fi $install gcc make socat psmisc xterm ssh iperf telnet \ - ethtool help2man $pf pylint pep8 \ + ethtool help2man pylint3 pep8 \ net-tools \ ${PYPKG}-pexpect ${PYPKG}-tk + $install --no-install-recommends $pf # Install pip $install ${PYPKG}-pip || $install ${PYPKG}-pip-whl if ! ${PYTHON} -m pip -V; then