updated pkgver() array, use dep

3 files changed, 47 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fef50468e253..739766573bc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,17 @@
 pkgbase = gosearch-git
-	pkgdesc = A fast, real-time file searching program for Linux 5.1+
-	pkgver = r51.10a3ea1
-	pkgrel = 2
+	pkgdesc = A fast, real-time file searching program
+	pkgver = 0.1.r21.518ad3c
+	pkgrel = 1
 	url = https://github.com/ozeidan/gosearch
 	install = gosearch.install
 	arch = x86_64
 	license = GPL3
-	makedepends = go-pie
 	makedepends = git
+	makedepends = go-pie
+	makedepends = dep
 	provides = gosearch
 	conflicts = gosearch
-	source = gosearch-git::git+https://github.com/ozeidan/gosearch
+	source = git+https://github.com/ozeidan/gosearch.git
 	sha256sums = SKIP
 
 pkgname = gosearch-git
diff --git a/PKGBUILD b/PKGBUILD
index 5a129e802477..22d389dd4ff6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,47 @@
-# Maintainer: Juan Simón <play4pro@protonmail.com>
-
+# Maintainer: Mark Wagie <yochanan dot marqos at gmail dot com>
+# Contributor: Juan Simón <play4pro at protonmail dot com>
 pkgname=gosearch-git
-pkgver=r51.10a3ea1
-pkgrel=2
-pkgdesc="A fast, real-time file searching program for Linux 5.1+"
-url="https://github.com/ozeidan/gosearch"
+pkgver=0.1.r21.518ad3c
+pkgrel=1
+pkgdesc="A fast, real-time file searching program"
 arch=('x86_64')
+url="https://github.com/ozeidan/gosearch"
 license=('GPL3')
-makedepends=(go-pie git)
+makedepends=('git' 'go-pie' 'dep')
 provides=("${pkgname%-git}")
-conflicts=("${provides[@]}")
-source=("${pkgname}::git+${url}")
+conflicts=("${pkgname%-git}")
+install="${pkgname%-git}.install"
+source=('git+https://github.com/ozeidan/gosearch.git')
 sha256sums=('SKIP')
 
-install="gosearch.install"
-
 pkgver() {
-	cd "$srcdir"/$pkgname
-
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$srcdir/${pkgname%-git}"
+	printf "%s" "$(git describe --long | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
-prepare(){
+prepare() {
 	mkdir -p gopath/src/github.com/ozeidan
-	ln -rTsf $pkgname gopath/src/github.com/ozeidan/$pkgname
+	ln -rTsf "${pkgname%-git}" gopath/src/github.com/ozeidan/"${pkgname%-git}"
 	
 	export GOPATH="$srcdir"/gopath
 	export GO111MODULE=on
 	
-	cd gopath/src/github.com/ozeidan/$pkgname
-	make deps
-	
-	cd "$srcdir"/$pkgname	
-	sed -i -e 's/clean$/clean -modcache/1' -e '/rm -f \$./d' Makefile	
+	cd gopath/src/github.com/ozeidan/"${pkgname%-git}"
+	dep init
+	dep ensure
 }
 
 build() {
 	export GOPATH="$srcdir"/gopath
-	export GOFLAGS="-gcflags=all=-trimpath=${srcdir} -asmflags=all=-trimpath=${srcdir} -ldflags=-extldflags=-zrelro -ldflags=-extldflags=-znow"
-	
-	cd "$srcdir"/$pkgname
-	make all
-	make clean
+	export GOFLAGS="-gcflags=all=-trimpath=${PWD} -asmflags=all=-trimpath=${PWD} -ldflags=-extldflags=-zrelro -ldflags=-extldflags=-znow"
+
+	cd "$srcdir/${pkgname%-git}"
+	make build
 }
 
 package() {
-	cd "$srcdir"/$pkgname
-	
-	install -Dm755 gosearchServer "${pkgdir}"/usr/bin/gosearchServer
-	install -Dm755 gosearch "${pkgdir}"/usr/bin/gosearch
-	install -Dm644 init/gosearch.service "${pkgdir}"/usr/lib/systemd/system/gosearch.service   
+	cd "$srcdir/${pkgname%-git}"
+	install -Dm755 ${pkgname%-git} $pkgdir/usr/bin/${pkgname%-git}
+	install -Dm755 gosearchServer $pkgdir/usr/bin/gosearchServer
+	install -Dm644 init/${pkgname%-git}.service $pkgdir/etc/systemd/system/${pkgname%-git}.service
 }
diff --git a/gosearch.install b/gosearch.install
index 8f60d9a58f86..660d749b4fc2 100644
--- a/gosearch.install
+++ b/gosearch.install
@@ -1,17 +1,27 @@
+pre_install() {
+	if systemctl status gosearch &> /dev/null; then
+		echo 'Stopping & disabling gosearch service...'
+		systemctl disable --now gosearch.service
+	fi
+}
+
 post_install() {
-  systemctl enable gosearch.service
-  systemctl start gosearch.service
+	echo 'Starting & enabling gosearch service...'
+	systemctl enable --now gosearch.service
 }
 
 pre_upgrade() {
-  systemctl stop gosearch.service
+	echo 'Stopping gosearch service...'
+	systemctl stop gosearch.service
 }
 
 post_upgrade() {
-  systemctl daemon-reload
-  systemctl start gosearch.service
+	echo 'Restarting gosearch service...'
+	systemctl daemon-reload
+	systemctl start gosearch.service
 }
 
 pre_remove() {
-  systemctl stop gosearch.service
+	echo 'Stopping & disabling gosearch service...'
+	systemctl disable --now gosearch.service
 }