From e2941f8faef50f05db7650d016d902edd496d306 Mon Sep 17 00:00:00 2001 From: Orazio Date: Mon, 2 Dec 2019 17:00:39 +0100 Subject: [PATCH] Properly avoid pulling unwanted packages from unstable repo Currently apt pulls all packages from the unstable repo because the script intendation created the file 'limit-unstable' with tabs in it. Fixed using printf to create a multiline file (which is the way wireguard.com/install suggests). --- auto_install/install.sh | 12 ++---------- scripts/wireguard/bash-completion | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 scripts/wireguard/bash-completion diff --git a/auto_install/install.sh b/auto_install/install.sh index 95a3a81..35a86cf 100755 --- a/auto_install/install.sh +++ b/auto_install/install.sh @@ -722,13 +722,7 @@ installWireGuard(){ # Do not upgrade packages from the unstable repository except for wireguard echo "::: Adding Debian repository... " echo "deb http://deb.debian.org/debian/ unstable main" | $SUDO tee /etc/apt/sources.list.d/unstable.list > /dev/null - echo "Package: * - Pin: release a=unstable - Pin-Priority: 1 - - Package: wireguard wireguard-dkms wireguard-tools - Pin: release a=unstable - Pin-Priority: 500" | $SUDO tee /etc/apt/preferences.d/limit-unstable > /dev/null + printf 'Package: *\nPin: release a=unstable\nPin-Priority: 1\n\nPackage: wireguard wireguard-dkms wireguard-tools\nPin: release a=unstable\nPin-Priority: 500\n' | $SUDO tee /etc/apt/preferences.d/limit-unstable > /dev/null $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC 648ACFD622F3D138 $SUDO ${UPDATE_PKG_CACHE} &> /dev/null @@ -816,9 +810,7 @@ installWireGuard(){ echo "::: Installing WireGuard from Debian package... " echo "::: Adding Debian repository... " echo "deb http://deb.debian.org/debian/ unstable main" | $SUDO tee /etc/apt/sources.list.d/unstable.list > /dev/null - echo "Package: * - Pin: release a=unstable - Pin-Priority: 90" | $SUDO tee /etc/apt/preferences.d/limit-unstable > /dev/null + printf 'Package: *\nPin: release a=unstable\nPin-Priority: 90\n' | $SUDO tee /etc/apt/preferences.d/limit-unstable > /dev/null $SUDO ${UPDATE_PKG_CACHE} &> /dev/null PIVPN_DEPS=(linux-headers-amd64 qrencode wireguard wireguard-tools wireguard-dkms) installDependentPackages PIVPN_DEPS[@] diff --git a/scripts/wireguard/bash-completion b/scripts/wireguard/bash-completion new file mode 100644 index 0000000..9eb591e --- /dev/null +++ b/scripts/wireguard/bash-completion @@ -0,0 +1,19 @@ +_pivpn() +{ + local cur prev opts + COMPREPLY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + dashopts="-a -c -d -l -qr -r -h -u" + opts="add clients debug list qrcode remove help uninstall" + if [ "${#COMP_WORDS[@]}" -eq 2 ] + then + if [[ ${cur} == -* ]] ; then + COMPREPLY=( $(compgen -W "${dashopts}" -- "${cur}") ) + else + COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") ) + fi + fi + return 0 +} +complete -F _pivpn pivpn