New package: olivetin-3000.20.0

Author: dkarvik

srcpkgs/olivetin/files/olivetin/run

@@ -3,7 +3,5 @@ exec 2>&1
 
 [ -r ./conf ] && . ./conf
 
-: "${OPTS:=-config /etc/OliveTin/config.yaml}"
-
 cd /var/lib/olivetin
 exec chpst -u _olivetin OliveTin -configdir /etc/OliveTin ${OPTS}

srcpkgs/olivetin/template

@@ -2,30 +2,33 @@
 pkgname=olivetin
 version=3000.20.0
 revision=1
-nopie=yes
-wrksrc="OliveTin-${version}"
-hostmakedepends="go nodejs python3"
-
+archs="~i686"
+build_style=go
+build_wrksrc="service"
+go_import_path=github.com/OliveTin/OliveTin
+go_package=.
+go_ldflags="-X main.version=${version}"
+hostmakedepends="nodejs python3"
 short_desc="Web interface for running predefined shell commands"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Dominic Karvik <dominic@dominic.io>"
 license="AGPL-3.0-only"
 homepage="https://www.olivetin.app/"
 distfiles="https://github.com/OliveTin/OliveTin/archive/refs/tags/${version}.tar.gz"
 checksum=fa0cd2ef577756e701aeb0ce4ee3918019e5c78ce4ecee568d51e31a65f4474a
+nopie=yes
 system_accounts="_olivetin"
 make_dirs="/etc/OliveTin 0750 _olivetin _olivetin
  /var/lib/olivetin 0750 _olivetin _olivetin"
 
-do_build() {
-	make -C frontend dist
-	sed -i 's|config.WebUIDir = "./webui"|config.WebUIDir = "/usr/share/olivetin/webui"|' service/internal/config/config.go
-	(cd service && go build -buildmode=pie -ldflags "-X main.version=${version}" -o OliveTin .)
+pre_build() {
+	make -C ../frontend dist
+	sed -i 's|config.WebUIDir = "./webui"|config.WebUIDir = "/usr/share/olivetin/webui"|' internal/config/config.go
 }
 
 do_install() {
-	vbin service/OliveTin
+	vbin "${GOPATH}/bin/OliveTin"
 	vmkdir usr/share/olivetin/webui
-	vcopy frontend/dist/. usr/share/olivetin/webui
+	vcopy ../frontend/dist/. usr/share/olivetin/webui
+	vlicense ../LICENSE
 	vsv olivetin
 }
-