DomainKey-Signature: a=rsa-sha1; c=nofws; d=toastin.space; h=from:to:cc
	:subject:date:message-id:in-reply-to:references:mime-version
	:content-transfer-encoding; q=dns; s=ml; b=mw+oaf63rx59Xo7ZsQUlZ
	WI0ufGoScKOiTsA5w3CZ1FEXO+JMUlGhJ1iD9P3VZJz7KS+Sjbdo5CLBvDPpb+Bk
	8LzshuABDAOotRqdVoE54EogBrM3YTibhKZ34KHy1PzudHTJuUHI18OMRzFmxUyl
	CxH2du9cUhRc0OJ87QH1wPoYhRjam/PrzDt8KkL0CbgpIIR7Gz4bYVofaSmdPivA
	MBabF5iYbDeQkGMojQh+472VW3YsSEzHky+TH8WWWy6Ia/1u1wiyxyYaMlp2zRt9
	oolWTz2Pmied2eD1flqx1xbSfOPvxyZRl+Ok6MCFdDryI4GsnOxjBYpxTxEF7kyJ
	w==
From: Chloe Kudryavtsev <toast@toastin.space>
To: alpine-devel@lists.alpinelinux.org
Cc: Chloe Kudryavtsev <toast@toastin.space>
Subject: [alpine-devel] [PATCH 2/2] Add default_cleanup_srcdir
Date: Sat,  8 Dec 2018 13:22:44 -0500
Message-Id: <20181208182254.4300-3-toast@toastin.space>
In-Reply-To: <20181208182254.4300-1-toast@toastin.space>
References: <20181208182254.4300-1-toast@toastin.space>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

In some cases, a simple rm -rf is not sufficent to clean srcdir.
One such case is the new go module system, that marks everything as
read-only - thus only letting root rm -rf it without a chmod.
There is a command intended to clean them - `go clean -modcache`.
However, for that to work, GOPATH must be defined and existent.
Running chmod for all srcdir cleanups makes no sense, nor does enforcing
root, or putting global overrides just for go.

This patch allows overriding what happens on `cleanup srcdir`, by
overriding cleanup_srcdir, and allows the use of default_cleanup_srcdir.

In our go example, it might be used as such:

cleanup_srcdir() {
	go clean -modcache
	default_cleanup_srcdir
}
---
 abuild.in | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/abuild.in b/abuild.in
index eceb9f2..bee3ec2 100644
--- a/abuild.in
+++ b/abuild.in
@@ -76,6 +76,14 @@ want_check() {
 	return 0
 }
 
+default_cleanup_srcdir() {
+	rm -rf "$srcdir"
+}
+
+cleanup_srcdir() {
+	default_cleanup_srcdir
+}
+
 cleanup() {
 	local i=
 	[ -z "$subpkgdir" ] && set_xterm_title ""
@@ -90,7 +98,7 @@ cleanup() {
 				abuild-rmtemp "$BUILD_ROOT"
 			fi;;
 		pkgdir) msg "Cleaning up pkgdir"; rm -rf "$pkgbasedir";;
-		srcdir) msg "Cleaning up srcdir"; rm -rf "$srcdir";;
+		srcdir) msg "Cleaning up srcdir"; cleanup_srcdir;;
 		deps)
 			if [ -z "$install_after" ] && [ -n "$uninstall_after" ]; then
 				msg "Uninstalling dependencies..."
-- 
2.19.2



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---