From 3db049ee6ebfa6ace042afded1db034354d2b73b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 23 Aug 2018 16:07:01 +0100
Subject: [PATCH] Extra directory check after tor uninstall
---
src/freedombone-utils-onion | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index c464f2b6d..01380e503 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -348,8 +348,12 @@ function install_tor {
# ensure that any previous keys are removed
if [ -d /var/lib/tor ]; then
+ echo $'Uninstalling Tor'
$REMOVE_PACKAGES tor
- rm -rf /var/lib/tor
+ if [ -d /var/lib/tor ]; then
+ echo $'Removing Tor keys'
+ rm -rf /var/lib/tor
+ fi
fi
if [ -d /etc/torrc.d ]; then
rm -rf /etc/torrc.d/*
@@ -357,7 +361,7 @@ function install_tor {
$INSTALL_PACKAGES_BACKPORTS tor
if [ ! -f /etc/tor/torrc ]; then
- echo 'Tor failed to install'
+ echo $'Tor failed to install'
exit 38259
fi
--
GitLab