sbotools2

commit f137810abb336cd8cfda5087419fb4b99c12e5fe
parent 8e5db4d52e2da1495d9891a80283c619b5582dce
Author: Andreas Guldstrand <andreas.guldstrand@gmail.com>
Date:   Fri, 18 Dec 2015 00:08:31 +0100

Fix package cleanup

Diffstat:
M
SBO-Lib/lib/SBO/Lib.pm
 | 
9
++++++---

1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/SBO-Lib/lib/SBO/Lib.pm b/SBO-Lib/lib/SBO/Lib.pm
@@ -1053,7 +1053,7 @@ sub do_slackbuild {
 	return $version, $pkg, $src;
 }
 
-# remove work directories (source and packaging dirs under /tmp/SBo or $TMP)
+# remove work directories (source and packaging dirs under /tmp/SBo or $TMP and /tmp or $OUTPUT)
 sub make_clean {
 	my %args = (
 		SBO		=> '',
@@ -1069,8 +1069,11 @@ sub make_clean {
 	for my $dir (@$src) {
 		remove_tree("$tmpd/$dir") if -d "$tmpd/$dir";
 	}
-	remove_tree("$tmpd/package-$args{SBO}") if
-		-d "$tmpd/package-$args{SBO}";
+
+	my $output = $ENV{OUTPUT} // '/tmp';
+	remove_tree("$output/package-$args{SBO}") if
+		-d "$output/package-$args{SBO}";
+
 	if ($args{SBO} =~ /^(.+)-compat32$/) {
 		my $pkg_name = $1;
 		remove_tree("/tmp/package-$args{SBO}") if