Fixing unnecessary sudo and tagging

2 files changed, 22 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 97387b897d5c..9f3d7557df1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = cpick
 	pkgdesc = Extensive color picker in the terminal.
-	pkgver = 0.9.3
+	pkgver = v0.9.3
 	pkgrel = 1
 	url = https://gitlab.com/ethanbakerdev/cpick
 	arch = x86_64
 	license = Apache
 	makedepends = git
-	depends = go
-	source = git+https://gitlab.com/ethanbakerdev/cpick.git
+	makedepends = go
+	source = git+https://gitlab.com/ethanbakerdev/cpick.git#tag=v0.9.3
 	sha256sums = SKIP
 
 pkgname = cpick
diff --git a/PKGBUILD b/PKGBUILD
index a383b3c3fdce..142812da25dd 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ethan Baker <mail@ethanbaker.dev>
 # Contributor: Ethan Baker <mail@ethanbaker.dev>
 pkgname='cpick'
-pkgver=0.9.3
+pkgver=v0.9.3
 pkgrel=1
 #epoch=
 pkgdesc="Extensive color picker in the terminal."
@@ -9,8 +9,8 @@ arch=('x86_64')
 url="https://gitlab.com/ethanbakerdev/cpick"
 license=('Apache')
 groups=()
-depends=('go')
-makedepends=('git')
+depends=()
+makedepends=('git' 'go')
 checkdepends=()
 optdepends=()
 provides=()
@@ -20,30 +20,36 @@ backup=()
 options=()
 #install=
 #changelog=
-source=("git+https://gitlab.com/ethanbakerdev/cpick.git")
+source=("git+https://gitlab.com/ethanbakerdev/cpick.git#tag=$pkgver")
 noextract=()
 sha256sums=('SKIP')
 #md5sums=()
 #validpgpkeys=()
 
+pkgver() {
+	cd "$pkgname"
+	git describe --long | sed -r 's/-(.*)//'
+}
+
 prepare() {
-	cd "${pkgname}"
+	cd "$pkgname"
 	mkdir -p build/
+	mkdir go
 }
 
 build() {
-	cd "${pkgname}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export CGO_CFLAGS="${CFLAGS}"
+	cd "$pkgname"
 	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
 	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
 	export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-	sudo go build -o build ./...
+	go build -o build ./cmd/...
 }
 
 package() {
-	cd "${pkgname}"
-	install -Dm755 build/cpick "${pkgdir}/usr/bin/${pkgname}"
-	install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd "$pkgname"
+	install -Dm755 build/cpick "$pkgdir"/usr/bin/"$pkgname"
+	install -Dm644 README.md -t "$pkgdir"/usr/share/doc/"$pkgname"
+	install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }