From b42f531b5b46911989cb257526d11854c1286aa4 Mon Sep 17 00:00:00 2001
From: Marty Sluijtman <marty.wanderer@disroot.org>
Date: Sun, 21 Aug 2022 23:33:09 +0200
Subject: [PATCH] New package version

---
 APKBUILD |  8 +++++---
 Makefile | 21 +++++++--------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/APKBUILD b/APKBUILD
index b557177..c457189 100644
--- a/APKBUILD
+++ b/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Marty Sluijtman <marty.wanderer@disroot.org>
 pkgname=sheet-parser
 pkgver=0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A little D&D character sheet parser written in go"
 url="https://gitlab.com/EternalWanderer/sheet-parser"
 arch="all"
@@ -20,7 +20,9 @@ build() {
 
 package() {
 	make install PREFIX=/usr DESTDIR="$pkgdir"
-	install -D -m 644 misc/auto-completion/zsh/_nnn \
-                "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
+	install -D -m 644 zsh.completion "$pkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
+sha512sums="
+95293910817dee22a1944e6c11d37eee44bb0d3dbb20446d099f6a5434b307d1a489106f98642644019bf08c80256235e797426027ff3cdb5e3ac372d1e885bc  sheet-parser-0.1.tar.gz
+"
diff --git a/Makefile b/Makefile
index 69c3967..a55e1f4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,35 +3,28 @@ PREFIX = /usr/local
 MANPREFIX = $(PREFIX)/share/man
 ZSH_COMPLETION_OUTPUT := zsh.completion
 
-SRC = main.go go.mod sheetContent.go
+SRC = main.go go.mod sheetContent.go go.sum
 
 all: sheet-parser
 
 sheet-parser:
-	go build -o sheet-parser -buildvcs=false
+	go build -o sheet-parser -trimpath
 
 clean: 
 	rm -f sheet-parser sheet-parser-$(VERSION).tar.gz
 
 dist: clean
 	mkdir -p sheet-parser-$(VERSION)
-	cp -R LICENSE Makefile README.md sheet-parser.1 $(SRC) sheet-parser-$(VERSION)
+	cp -R $(ZSH_COMPLETION_OUTPUT) LICENSE Makefile README.md sheet-parser.1 $(SRC) sheet-parser-$(VERSION)
 	tar -cf sheet-parser-$(VERSION).tar sheet-parser-$(VERSION)
 	gzip sheet-parser-$(VERSION).tar
 	rm -rf sheet-parser-$(VERSION)
 
 install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f sheet-parser $(DESTDIR)$(PREFIX)/bin
-	chmod 775 $(DESTDIR)$(PREFIX)/bin/sheet-parser
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	cat sheet-parser.1 > $(DESTDIR)$(MANPREFIX)/man1/sheet-parser.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/sheet-parser.1
-
-install-completions:
-	@install -d $(DESTDIR)$(PREFIX)/share/zsh/site-functions 
-	@install -m 0644 $(ZSH_COMPLETION_OUTPUT) $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_sheet-parser
-	@printf '%s\n' '$(OK)'
+	install -m 0775 -d $(DESTDIR)$(PREFIX)/bin
+	install -m 755 sheet-parser $(DESTDIR)$(PREFIX)/bin
+	install -m 0775 -d $(DESTDIR)$(MANPREFIX)/man1
+	install -m 644 sheet-parser.1 $(DESTDIR)$(MANPREFIX)/man1
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/sheet-parser\