follow best practices

2 files changed, 9 insertions, 54 deletions

diff --git a/PKGBUILD b/PKGBUILD
index baeab759a7d4..57ef6e94f4c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=popura-git
 _pkgname="popura"
 pkgver=0.3.15+popura1
 _commit=42941caaf13472f1ecc0c675ae6059a857f3e60a
-pkgrel=1
+pkgrel=2
 pkgdesc="Popura ポプラ: alternative Yggdrasil network client"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64')
 url="https://github.com/popura-network/Popura"
@@ -27,6 +27,14 @@ build() {
 
 package() {
 	cd "${srcdir}/${_pkgname}"
+
+	export GOPATH="${srcdir}/gopath"
+	export CGO_CPPFLAGS="${CPPFLAGS}"
+	export CGO_CFLAGS="${CFLAGS}"
+	export CGO_CXXFLAGS="${CXXFLAGS}"
+	export CGO_LDFLAGS="${LDFLAGS}"
+	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+
 	install -Dm755 "yggdrasil" "${pkgdir}/usr/bin/popura"
 	install -Dm755 "yggdrasilctl" "${pkgdir}/usr/bin/popuractl"
 	install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${_pkgname}"
diff --git a/update_version.sh b/update_version.sh
deleted file mode 100755
index c643a8d1cfcf..000000000000
--- a/update_version.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-REPO="https://github.com/yggdrasil-network/yggdrasil-go.git"
-WORKDIR="/tmp/yggdrasil-go"
-
-# Set up cleanup
-function cleanup() {
-	rm -rf ${WORKDIR}
-}
-trap cleanup EXIT
-
-# Check out latest master
-git clone ${REPO} ${WORKDIR}
-
-# Fetch version information
-pushd ${WORKDIR}
-git checkout develop
-
-VER=$(git describe --tags --long --always)
-VER=${VER/-/.r}
-VER=${VER/-/.}
-VER=${VER#v}
-
-COMMIT=$(git rev-parse HEAD)
-
-# Replace version in PKGBUILD
-popd
-sed -i \
-	-e "s/^pkgver=.*$/pkgver=${VER}/" \
-	-e "s/^_commit=.*$/_commit=${COMMIT}/" \
-	PKGBUILD
-
-# Check for real updates
-if (git diff --exit-code PKGBUILD); then
-	echo "Version ${VER} is already in PKGBUILD, not updating"
-	exit 0
-fi
-
-# Reset pkgrel
-sed -i \
-	-e 's/pkgrel=.*/pkgrel=1/' \
-	PKGBUILD
-
-# Update source hashes
-updpkgsums
-
-# Update .SRCINFO
-makepkg --printsrcinfo >.SRCINFO
-
-# Create update-commit
-git add PKGBUILD .SRCINFO
-git commit -m "yggdrasil-go v${VER}"