wbk/wireguard-install
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix

Browse source 
Variables which can be empty, shouldn't be quoted in this situation.
This commit is contained in:
Nyr 2020-05-25 17:25:50 +02:00
parent aa04ca5dcf
commit 3a2ba591ba
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
wireguard-install.sh
View file

@ -308,7 +308,7 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
if [[ "$os" == "ubuntu" && "$os_version" -ge 2004 ]]; then if [[ "$os" == "ubuntu" && "$os_version" -ge 2004 ]]; then
# Ubuntu 20.04 or higer # Ubuntu 20.04 or higer
apt-get update apt-get update
apt-get install -y wireguard qrencode "$firewall" apt-get install -y wireguard qrencode $firewall
elif [[ "$os" == "ubuntu" && "$os_version" -eq 1804 ]]; then elif [[ "$os" == "ubuntu" && "$os_version" -eq 1804 ]]; then
# Ubuntu 18.04 # Ubuntu 18.04
# Repo is added manually so we don't depend on add-apt-repository. # Repo is added manually so we don't depend on add-apt-repository.
@ -327,7 +327,7 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
# the system has an outdated kernel, there is no guarantee that old headers were # the system has an outdated kernel, there is no guarantee that old headers were
# still downloadable and to provide suitable headers for future kernel updates. # still downloadable and to provide suitable headers for future kernel updates.
apt-get install -y linux-headers-generic apt-get install -y linux-headers-generic
apt-get install -y wireguard qrencode "$firewall" apt-get install -y wireguard qrencode $firewall
elif [[ "$os" == "debian" && "$os_version" -eq 10 ]]; then elif [[ "$os" == "debian" && "$os_version" -eq 10 ]]; then
# Debian 10 # Debian 10
if ! grep -qs '^deb .* buster-backports main' /etc/apt/sources.list /etc/apt/sources.list.d/*.list; then if ! grep -qs '^deb .* buster-backports main' /etc/apt/sources.list /etc/apt/sources.list.d/*.list; then
@ -345,21 +345,21 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
# headers were still downloadable and to provide suitable headers for future # headers were still downloadable and to provide suitable headers for future
# kernel updates. # kernel updates.
apt-get install -y linux-headers-"$architecture" apt-get install -y linux-headers-"$architecture"
apt-get install -y wireguard qrencode "$firewall" apt-get install -y wireguard qrencode $firewall
elif [[ "$os" == "centos" && "$os_version" -eq 8 ]]; then elif [[ "$os" == "centos" && "$os_version" -eq 8 ]]; then
# CentOS 8 # CentOS 8
dnf install -y epel-release elrepo-release dnf install -y epel-release elrepo-release
dnf install -y kmod-wireguard wireguard-tools qrencode "$firewall" dnf install -y kmod-wireguard wireguard-tools qrencode $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
elif [[ "$os" == "centos" && "$os_version" -eq 7 ]]; then elif [[ "$os" == "centos" && "$os_version" -eq 7 ]]; then
# CentOS 7 # CentOS 7
yum install -y epel-release https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm yum install -y epel-release https://www.elrepo.org/elrepo-release-7.el7.elrepo.noarch.rpm
yum install -y yum-plugin-elrepo yum install -y yum-plugin-elrepo
yum install -y kmod-wireguard wireguard-tools qrencode "$firewall" yum install -y kmod-wireguard wireguard-tools qrencode $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
elif [[ "$os" == "fedora" ]]; then elif [[ "$os" == "fedora" ]]; then
# Fedora # Fedora
dnf install -y wireguard-tools qrencode "$firewall" dnf install -y wireguard-tools qrencode $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
fi fi
# Else, we are inside a container and BoringTun needs to be used # Else, we are inside a container and BoringTun needs to be used
@ -368,7 +368,7 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
if [[ "$os" == "ubuntu" && "$os_version" -ge 2004 ]]; then if [[ "$os" == "ubuntu" && "$os_version" -ge 2004 ]]; then
# Ubuntu 20.04 or higer # Ubuntu 20.04 or higer
apt-get update apt-get update
apt-get install -y wireguard-tools qrencode ca-certificates "$cron" "$firewall" apt-get install -y wireguard-tools qrencode ca-certificates $cron $firewall
elif [[ "$os" == "ubuntu" && "$os_version" -eq 1804 ]]; then elif [[ "$os" == "ubuntu" && "$os_version" -eq 1804 ]]; then
# Ubuntu 18.04 # Ubuntu 18.04
# Repo is added manually so we don't depend on add-apt-repository. # Repo is added manually so we don't depend on add-apt-repository.
@ -380,7 +380,7 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
apt-key add - <<< "$ppa_key" apt-key add - <<< "$ppa_key"
echo "deb http://ppa.launchpad.net/wireguard/wireguard/ubuntu bionic main" > /etc/apt/sources.list.d/wireguard-ubuntu-wireguard-bionic.list echo "deb http://ppa.launchpad.net/wireguard/wireguard/ubuntu bionic main" > /etc/apt/sources.list.d/wireguard-ubuntu-wireguard-bionic.list
apt-get update apt-get update
apt-get install -y qrencode ca-certificates "$cron" "$firewall" apt-get install -y qrencode ca-certificates $cron $firewall
apt-get install -y wireguard-tools --no-install-recommends apt-get install -y wireguard-tools --no-install-recommends
elif [[ "$os" == "debian" && "$os_version" -eq 10 ]]; then elif [[ "$os" == "debian" && "$os_version" -eq 10 ]]; then
# Debian 10 # Debian 10
@ -388,21 +388,21 @@ fiJGS5WoFr1yr8b7oQxTrZlCeHk3r3FJIhv2dQ==
echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list echo "deb http://deb.debian.org/debian buster-backports main" >> /etc/apt/sources.list
fi fi
apt-get update apt-get update
apt-get install -y qrencode ca-certificates "$cron" "$firewall" apt-get install -y qrencode ca-certificates $cron $firewall
apt-get install -y wireguard-tools --no-install-recommends apt-get install -y wireguard-tools --no-install-recommends
elif [[ "$os" == "centos" && "$os_version" -eq 8 ]]; then elif [[ "$os" == "centos" && "$os_version" -eq 8 ]]; then
# CentOS 8 # CentOS 8
dnf install -y epel-release dnf install -y epel-release
dnf install -y wireguard-tools qrencode ca-certificates tar "$cron" "$firewall" dnf install -y wireguard-tools qrencode ca-certificates tar $cron $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
elif [[ "$os" == "centos" && "$os_version" -eq 7 ]]; then elif [[ "$os" == "centos" && "$os_version" -eq 7 ]]; then
# CentOS 7 # CentOS 7
yum install -y epel-release yum install -y epel-release
yum install -y wireguard-tools qrencode ca-certificates tar "$cron" "$firewall" yum install -y wireguard-tools qrencode ca-certificates tar $cron $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
elif [[ "$os" == "fedora" ]]; then elif [[ "$os" == "fedora" ]]; then
# Fedora # Fedora
dnf install -y wireguard-tools qrencode ca-certificates tar "$cron" "$firewall" dnf install -y wireguard-tools qrencode ca-certificates tar $cron $firewall
mkdir -p /etc/wireguard/ mkdir -p /etc/wireguard/
fi fi
# Grab the BoringTun binary using wget or curl and extract into the right place. # Grab the BoringTun binary using wget or curl and extract into the right place.