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

uninstall fixes

Browse source
This commit is contained in:
Ubuntu 2020-05-10 21:13:03 +00:00
parent 969cff7848
commit b230bade61
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/uninstall.sh
View file

@ -31,7 +31,9 @@ c=$(( c < 70 ? 70 : c ))
PKG_MANAGER="apt-get" PKG_MANAGER="apt-get"
UPDATE_PKG_CACHE="${PKG_MANAGER} update" UPDATE_PKG_CACHE="${PKG_MANAGER} update"
dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf" dnsmasqConfig="/etc/dnsmasq.d/02-pivpn.conf"
setupVars="/etc/pivpn/${VPN}/setupVars.conf" setupConfigDir="/etc/pivpn"
setupVarsFile="setupVars.conf"
setupVars="${setupConfigDir}/${VPN}/${setupVarsFile}"
if [ ! -f "${setupVars}" ]; then if [ ! -f "${setupVars}" ]; then
echo "::: Missing setup vars file!" echo "::: Missing setup vars file!"
@ -41,21 +43,11 @@ fi
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${setupVars}" source "${setupVars}"
# if the other protocol file exists it has been installed
if [[ ${VPN} == 'wireguard' ]]; then if [[ ${VPN} == 'wireguard' ]]; then
othervpn='openvpn' othervpn='openvpn'
else else
othervpn='wireguard' othervpn='wireguard'
fi fi
vpnStillExists=no
if [ -r "${setupConfigDir}/${othervpn}/${setupVarsFile}" ]; then
$SUDO rm -f /usr/local/bin/pivpn
$SUDO ln -s -T ${pivpnScriptDir}/${othervpn}/pivpn.sh /usr/local/bin/pivpn
vpnStillExists=yes
echo ":::"
echo "::: Two VPN protocols exist, you should remove the other one too"
echo ":::"
fi
### FIXME: introduce global lib ### FIXME: introduce global lib
spinner(){ spinner(){
@ -190,8 +182,18 @@ removeAll(){
rm -rf /etc/pivpn/${VPN} rm -rf /etc/pivpn/${VPN}
rmdir /etc/pivpn rmdir /etc/pivpn
rm -f /var/log/*pivpn* rm -f /var/log/*pivpn*
rm -rf /usr/local/bin/pivpn/${VPN}
if [ ${vpnStillExists} != 'yes' ]; then vpnStillExists='no'
if [ -r "${setupConfigDir}/${othervpn}/${setupVarsFile}" ]; then
$SUDO rm -f /usr/local/bin/pivpn
$SUDO ln -s -T ${pivpnScriptDir}/${othervpn}/pivpn.sh /usr/local/bin/pivpn
vpnStillExists='yes'
echo ":::"
echo "::: Two VPN protocols exist, you should remove the other one too"
echo ":::"
else
rm -f /etc/bash_completion.d/pivpn rm -f /etc/bash_completion.d/pivpn
fi fi