From 1a47699f21677e71e8ad7c052b31c692b29b8d3d Mon Sep 17 00:00:00 2001 From: AndreasAc <51840927+AndreasAc@users.noreply.github.com> Date: Fri, 1 Apr 2022 00:13:57 +0200 Subject: [PATCH] Add support for Debian Bullseye to the setup script (#1118) --- util/install.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/util/install.sh b/util/install.sh index 09b6652..fd584b8 100755 --- a/util/install.sh +++ b/util/install.sh @@ -174,13 +174,22 @@ function mn_deps { python-pep8 ${PYPKG}-pexpect ${PYPKG}-tk else # Debian/Ubuntu pf=pyflakes + pep8=pep8 # Starting around 20.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 [ "$DIST" = "Ubuntu" -a `expr $RELEASE '>=' 20.04` = "1" ]; then pf=pyflakes3 fi + # Debian 11 "bullseye" renamed + # * pep8 to python3-pep8 + # * pyflakes to pyflakes3 + if [ "$DIST" = "Debian" -a `expr $RELEASE '>=' 11` = "1" ]; then + pf=pyflakes3 + pep8=python3-pep8 + fi + $install gcc make socat psmisc xterm ssh iperf telnet \ - ethtool help2man $pf pylint pep8 \ + ethtool help2man $pf pylint $pep8 \ net-tools \ ${PYPKG}-pexpect ${PYPKG}-tk # Install pip