Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2024-12-18 19:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Minor fixes

Browse source 
- 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
This commit is contained in:
Orazio 2020-02-11 11:50:18 +01:00
parent 337fa10fdc
commit 41ed9c4a6f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
auto_install/install.sh
View file

@ -425,8 +425,8 @@ notifyPackageUpdatesAvailable(){
preconfigurePackages(){ preconfigurePackages(){
# Add support for https repositories that will be used later on # Add support for https repositories that will be used later on
if [[ -f /etc/apt/sources.list ]]; then if [[ -f /etc/apt/sources.list ]]; then
# Only on stretch because on buster apt already support https transport # buster and bionic have apt >= 1.5 which has https support built in
if [[ ${OSCN} == "stretch" ]]; then if [[ ${OSCN} != "buster" ]] && [[ ${OSCN} != "bionic" ]]; then
BASE_DEPS+=("apt-transport-https") BASE_DEPS+=("apt-transport-https")
fi fi
fi fi
@ -439,7 +439,7 @@ preconfigurePackages(){
# if ufw is enabled, configure that. # if ufw is enabled, configure that.
# running as root because sometimes the executable is not in the user's $PATH # 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 $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 USING_UFW=0
else else
USING_UFW=1 USING_UFW=1