X-Original-To: alpine-aports@mail.alpinelinux.org
Delivered-To: alpine-aports@mail.alpinelinux.org
Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1])
	by mail.alpinelinux.org (Postfix) with ESMTP id A1121DC010E
	for <alpine-aports@mail.alpinelinux.org>; Wed, 30 Sep 2015 15:51:43 +0000 (UTC)
Received: from lithium.8pit.net (lithium.8pit.net [141.101.32.65])
	(using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mail.alpinelinux.org (Postfix) with ESMTPS id EA351DC00F4;
	Wed, 30 Sep 2015 15:51:42 +0000 (UTC)
Received: from localhost (ip5f5ac8fc.dynamic.kabel-deutschland.de [95.90.200.252]);
	by lithium.8pit.net (OpenSMTPD) with ESMTPSA id 70bb5b87;
	TLS version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO;
	Wed, 30 Sep 2015 17:51:41 +0200 (CEST)
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
To: alpine-aports@lists.alpinelinux.org
Subject: [alpine-aports] [PATCH] community/go: install all tools in $PATH
Date: Wed, 30 Sep 2015 17:51:36 +0200
Message-Id: <1443628296-32524-1-git-send-email-soeren+git@soeren-tempel.net>
X-Mailer: git-send-email 2.6.0
X-Virus-Scanned: ClamAV using ClamSMTP
X-Mailinglist: alpine-aports
Precedence: list
List-Id: Alpine Development <alpine-aports.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-aports+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-aports@lists.alpinelinux.org>
List-Help: <mailto:alpine-aports+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-aports+subscribe@lists.alpinelinux.org?subject=subscribe>

Previously you could only access them using `go tool <toolname>`
however, some software expects to find vet, godoc, et cetera in your
$PATH.

Regarding godoc we manually make it accessible via `go tool <toolname>`
as well, which isn't the default and might be dropped in the future.
---
 community/go/APKBUILD | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/community/go/APKBUILD b/community/go/APKBUILD
index ca7451f..59d3680 100644
--- a/community/go/APKBUILD
+++ b/community/go/APKBUILD
@@ -4,7 +4,7 @@ pkgname=go
 pkgver=1.5.1
 # This should be the latest commit on the corresponding release branch
 _toolsver="d02228d1857b9f49cd0252788516ff5584266eb6"
-pkgrel=2
+pkgrel=3
 pkgdesc="Go programming language compiler"
 url="http://www.golang.org/"
 arch="all"
@@ -76,11 +76,11 @@ build() {
 
 package() {
 	cd "$_builddir"
-	mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/lib/go "$pkgdir"/usr/share/doc/go
+	mkdir -p "$pkgdir"/usr/bin "$pkgdir"/usr/lib/go/bin "$pkgdir"/usr/share/doc/go
 
 	for binary in go gofmt; do
-		install -Dm755 bin/$binary "$pkgdir"/usr/lib/go/bin/$binary || return 1
-		ln -s /usr/lib/go/bin/$binary "$pkgdir"/usr/bin/$binary || return 1
+		mv bin/"$binary" "$pkgdir"/usr/lib/go/bin/ || return 1
+		ln -s /usr/lib/go/bin/"$binary" "$pkgdir"/usr/bin/ || return 1
 	done
 
 	# The source needs to be installed due to an upstream
@@ -107,9 +107,15 @@ tools() {
 	pkgdesc="Go programming language tools"
 	depends="$pkgname"
 
-	install -dm755 "$subpkgdir"/usr/lib/go/pkg/tool/linux_$GOARCH
-	install -Dm755 "$_builddir"/bin/godoc \
-		"$pkgdir"/usr/lib/go/pkg/tool/linux_$GOARCH/$tool
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib/go/bin
+	for binary in "$_builddir"/bin/*; do
+		mv $binary "$subpkgdir"/usr/lib/go/bin || return 1
+		ln -s /usr/lib/go/bin/"${binary##*/}" "$subpkgdir"/usr/bin/ || return 1
+	done
+
+	mkdir -p "$subpkgdir"/usr/lib/go/pkg/tool/linux_$GOARCH
+	cp "$subpkgdir"/usr/lib/go/bin/godoc \
+		"$pkgdir"/usr/lib/go/pkg/tool/linux_$GOARCH/godoc || return 1
 
 	for tool in $_gotools; do
 		mv "$pkgdir"/usr/lib/go/pkg/tool/linux_$GOARCH/$tool \
-- 
2.6.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---