From da0344e19b1f9e0bfe19398c3d15e18f5423b390 Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Mon, 11 Nov 2019 13:49:02 +0700 Subject: [PATCH 1/2] build-style/go: use glob instead of find --- common/build-style/go.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/build-style/go.sh b/common/build-style/go.sh index 97412843b20..c9f476b95c7 100644 --- a/common/build-style/go.sh +++ b/common/build-style/go.sh @@ -41,8 +41,9 @@ do_build() { } do_install() { - find "${GOPATH}/bin" -type f -executable | while read line - do - vbin "${line}" + for f in ${GOPATH}/bin/* ${GOPATH}/bin/**/*; do + if [ -f "$f" ] && [ -x "$f" ]; then + vbin "$f" + fi done } From 839f05e5a0b59ef501b4a5d2f7b21d7e37d2417c Mon Sep 17 00:00:00 2001 From: Doan Tran Cong Danh Date: Mon, 11 Nov 2019 13:59:12 +0700 Subject: [PATCH 2/2] doctl: don't use go get --- srcpkgs/doctl/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index 1ed77fc2a35..733ea20e279 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,17 +1,14 @@ # Template file for 'doctl' pkgname=doctl version=1.21.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" go_build_tags="v${version}" -go_get="yes" -hostmakedepends="git" +go_get="no" short_desc="Command line tool for DigitalOcean services" maintainer="Noah Huppert " license="Apache-2.0" homepage="https://github.com/digitalocean/doctl" - -post_install() { - vlicense "$GOPATH/src/github.com/digitalocean/doctl/LICENSE.txt" -} +distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz" +checksum=8c1e60930e913ace562511b6a7ee8f0d3f4d08d4ba48148f26e12b6d2eb95f2b