Package: ooniprobe
Followup-For: Bug #784254

Hi,

The attached patch fixes this, and will also remove the log directory if
it is empty.

I have tested this with piuparts and all tests pass now.

Thanks,
Iain.
>From 95955ebb174254b8e00c3899878620b7740bef42 Mon Sep 17 00:00:00 2001
From: "Iain R. Learmonth" <i...@fsfe.org>
Date: Tue, 5 May 2015 00:33:24 +0100
Subject: [PATCH] Add tests to postrm script; remove /var/log/ooni on purge

Signed-off-by: Iain R. Learmonth <i...@fsfe.org>
---
 debian/ooniprobe.postrm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/ooniprobe.postrm b/debian/ooniprobe.postrm
index 658c43d..78d8456 100644
--- a/debian/ooniprobe.postrm
+++ b/debian/ooniprobe.postrm
@@ -4,14 +4,17 @@ set -e
 
 case "$1" in
     purge)
-	rm -f /etc/default/ooniprobe
-	rm -rf /var/lib/ooni/.ooni
-	rm -rf /var/lib/ooni/decks
-	rm -rf /var/lib/ooni/inputs
-	rm -rf /var/lib/ooni/resources
-	rm -rf /var/lib/ooni/reports
-	rm -rf /var/lib/ooni/GeoIP
-	rmdir --ignore-fail-on-non-empty /var/lib/ooni
+	[ -f /etc/default/ooniprobe ] && rm -f /etc/default/ooniprobe
+	if [ -d /var/lib/ooni ]; then
+		rm -rf /var/lib/ooni/.ooni
+		rm -rf /var/lib/ooni/decks
+		rm -rf /var/lib/ooni/inputs
+		rm -rf /var/lib/ooni/resources
+		rm -rf /var/lib/ooni/reports
+		rm -rf /var/lib/ooni/GeoIP
+		rmdir --ignore-fail-on-non-empty /var/lib/ooni
+	fi
+	[ -d /var/log/ooni ] && rmdir --ignore-fail-on-non-empty /var/log/ooni
 	;;
 esac
 
-- 
2.1.4

Reply via email to