Make it actually build with 3.x and also rename task to task-go to avoid conflict with community/task

2 files changed, 17 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b4886866ac12..30947c4fc23d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = taskfile-git
 	pkgdesc = A task runner / simpler Make alternative written in Go
 	pkgver = 3.14.1.r12.g97d4a94
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/go-task/task
 	arch = any
 	license = MIT
diff --git a/PKGBUILD b/PKGBUILD
index ce61175f60d5..d030eb71d9ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname=taskfile-git
 _pkgname=task
 pkgver=3.14.1.r12.g97d4a94
-pkgrel=1
+pkgrel=2
 pkgdesc="A task runner / simpler Make alternative written in Go"
 arch=('any')
 license=('MIT')
@@ -15,27 +15,26 @@ source=("$_pkgname::git+https://github.com/go-task/task#branch=${BRANCH:-master}
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "$srcdir/$_pkgname"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+	cd "$srcdir/$_pkgname"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-    cd "$srcdir/$_pkgname"
-    rm -rf "$srcdir/go/src"
-    mkdir -p "$srcdir/go/src/$(dirname $_goname)"
-    export GOPATH="$srcdir/go"
-    cp -r "$srcdir/$_pkgname" "$srcdir/go/src/$_goname"
-    cd "$srcdir/go/src/$_goname/"
-    echo ":: Building binary"
-    go get -v \
-        -gcflags "-trimpath $GOPATH/src" ./cmd/...
+	cd "$srcdir/$_pkgname"
+	rm -rf "$srcdir/go/src"
+	mkdir -p "$srcdir/go/src/$(dirname $_goname)"
+	export GOPATH="$srcdir/go"
+	cp -r "$srcdir/$_pkgname" "$srcdir/go/src/$_goname"
+	cd "$srcdir/go/src/$_goname/"
+	echo ":: Building binary"
+	go install -v -gcflags "-trimpath $GOPATH/src" ./cmd/...
 }
 
 package() {
-    find "$srcdir/go/bin/" -type f -executable | while read filename; do
-        install -DT "$filename" "$pkgdir/usr/bin/$(basename $filename)"
-    done
+	find "$srcdir/go/bin/" -type f -executable | while read filename; do
+		install -DT "$filename" "$pkgdir/usr/bin/$(basename $filename)"
+	done
+	mv "${pkgdir}/usr/bin/task" "${pkgdir}/usr/bin/task-go"
 
-    install -DT "$srcdir/$_pkgname/completion/zsh/_task" \
-        "$pkgdir/usr/share/zsh/site-functions/_task"
+	install -DT "$srcdir/$_pkgname/completion/zsh/_task" "$pkgdir/usr/share/zsh/site-functions/_task"
 }