From ee472c4f764701bbc78f128622f01cb916f0641a Mon Sep 17 00:00:00 2001
From: J Pipkin <j@dawnrazor.net>
Date: Tue, 19 Feb 2013 13:33:30 -0600
Subject: support env vars $TMP and $OUTPUT, and clean some excess spaces at
 the ends of some lines

---
 sboclean | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'sboclean')

diff --git a/sboclean b/sboclean
index c9ee8c0..52708ed 100755
--- a/sboclean
+++ b/sboclean
@@ -78,7 +78,7 @@ sub remove_stuff($) {
 }
 
 sub clean_c32() {
-	my $dir = '/tmp';
+	my $dir = $tmpd;
 	opendir(my $dh, $dir);
 	FIRST: while (my $ls = readdir $dh) {
 		next FIRST unless $ls =~ /^package-.+-compat32$/;
@@ -89,7 +89,14 @@ sub clean_c32() {
 remove_stuff $config{SBO_HOME} .'/distfiles' if $clean_dist;
 
 if ($clean_work) {
-	remove_stuff '/tmp/SBo';
+	my $tsbo = $env_tmp ? $env_tmp : "$tmpd/SBo";
+	if ($tsbo =~ qr#^/tmp(|/)$# && !$interactive) {
+		warn "This will remove the entire contents of /tmp\n";
+		print "Proceed? [y] ";
+		remove_stuff $tsbo if <STDIN> =~ /^[yY\n]/;
+	} else {
+		remove_stuff $tsbo;
+	}
 	clean_c32;
 }
 
-- 
cgit v1.2.3


From a703387bceaa58be91ade36f1cf3473cb3939f3e Mon Sep 17 00:00:00 2001
From: J Pipkin <j@dawnrazor.net>
Date: Tue, 19 Feb 2013 13:57:55 -0600
Subject: need $SBO::Lib to access tmp vars

---
 sboclean | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sboclean')

diff --git a/sboclean b/sboclean
index 52708ed..61c47fc 100755
--- a/sboclean
+++ b/sboclean
@@ -78,7 +78,7 @@ sub remove_stuff($) {
 }
 
 sub clean_c32() {
-	my $dir = $tmpd;
+	my $dir = $SBO::Lib::tmpd;
 	opendir(my $dh, $dir);
 	FIRST: while (my $ls = readdir $dh) {
 		next FIRST unless $ls =~ /^package-.+-compat32$/;
@@ -89,7 +89,7 @@ sub clean_c32() {
 remove_stuff $config{SBO_HOME} .'/distfiles' if $clean_dist;
 
 if ($clean_work) {
-	my $tsbo = $env_tmp ? $env_tmp : "$tmpd/SBo";
+	my $tsbo = $SBO::Lib::env_tmp ? $SBO::Lib::env_tmp : "$SBO::Lib::tmpd/SBo";
 	if ($tsbo =~ qr#^/tmp(|/)$# && !$interactive) {
 		warn "This will remove the entire contents of /tmp\n";
 		print "Proceed? [y] ";
-- 
cgit v1.2.3


From 2483cc672c72ef8182035d65de1593dca8b94267 Mon Sep 17 00:00:00 2001
From: J Pipkin <j@dawnrazor.net>
Date: Sat, 2 Mar 2013 02:19:59 -0600
Subject: warn anything TMP is set, not just when TMP == /tmp

---
 sboclean | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'sboclean')

diff --git a/sboclean b/sboclean
index 61c47fc..4a2c131 100755
--- a/sboclean
+++ b/sboclean
@@ -89,9 +89,10 @@ sub clean_c32() {
 remove_stuff $config{SBO_HOME} .'/distfiles' if $clean_dist;
 
 if ($clean_work) {
-	my $tsbo = $SBO::Lib::env_tmp ? $SBO::Lib::env_tmp : "$SBO::Lib::tmpd/SBo";
-	if ($tsbo =~ qr#^/tmp(|/)$# && !$interactive) {
-		warn "This will remove the entire contents of /tmp\n";
+	my $env_tmp = $SBO::Lib::env_tmp;
+	my $tsbo = $env_tmp ? $env_tmp : "$SBO::Lib::tmpd/SBo";
+	if ($env_tmp && !$interactive) {
+		warn "This will remove the entire contents of $env_tmp\n";
 		print "Proceed? [y] ";
 		remove_stuff $tsbo if <STDIN> =~ /^[yY\n]/;
 	} else {
-- 
cgit v1.2.3