From 41ed9c4a6faa11770564cbed612ffa2f8611bd96 Mon Sep 17 00:00:00 2001 From: Orazio Date: Tue, 11 Feb 2020 11:50:18 +0100 Subject: [PATCH] Minor fixes - LC_ALL=C should be the canonical way to override the locale, instead of setting a specific one. - apt-transport-https is required on Ubuntu < Bionic and Debian < Buster --- auto_install/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auto_install/install.sh b/auto_install/install.sh index 384d9bb..c65bc84 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -425,8 +425,8 @@ notifyPackageUpdatesAvailable(){ preconfigurePackages(){ # Add support for https repositories that will be used later on if [[ -f /etc/apt/sources.list ]]; then - # Only on stretch because on buster apt already support https transport - if [[ ${OSCN} == "stretch" ]]; then + # buster and bionic have apt >= 1.5 which has https support built in + if [[ ${OSCN} != "buster" ]] && [[ ${OSCN} != "bionic" ]]; then BASE_DEPS+=("apt-transport-https") fi fi @@ -439,7 +439,7 @@ preconfigurePackages(){ # if ufw is enabled, configure that. # running as root because sometimes the executable is not in the user's $PATH if $SUDO bash -c 'command -v ufw' > /dev/null; then - if LANG=en_US.UTF-8 $SUDO ufw status | grep -q inactive; then + if LC_ALL=C $SUDO ufw status | grep -q inactive; then USING_UFW=0 else USING_UFW=1