fix build

1 files changed, 25 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 7660dbcce0a5..7ec11898b2d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,22 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-_pkgname1=privateness
-_pkgname=skycoin
+_pkgname=privateness
+_pkgname1=skycoin
 pkgname=privateness
-_githuborg1=NESS-Network
-_githuborg=skycoin
+_githuborg=NESS-Network
+_githuborg1=skycoin
 pkgdesc="NESS Core and Wallet. privateness.network"
-pkgver=20210502.9396_3744c21d5
+pkgver='autogenerated'
 #pkgver='autogenerated'
-pkgrel=1
-#pkgrel=2
+pkgrel=3
+#pkgrel=3
 arch=('x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm')
 _pkggopath="github.com/${_githuborg}/${_pkgname}"
 _pkggopath1="github.com/${_githuborg1}/${_pkgname1}"
 url="https://${_pkggopath}"
-url1="https://${_pkggopath1}"
+_url1="https://${_pkggopath1}"
 makedepends=('git' 'go' 'musl' 'kernel-headers-musl' 'skycoin')
-source=("git+${url}.git" ##branch=${BRANCH:-develop}"
-"git+${url}.git" ##branch=${BRANCH:-develop}"
+source=("git+${_url1}.git#branch=${BRANCH:-develop}"
+"git+${url}.git"
 "ness-wallet.sh")
 sha256sums=('SKIP'
             'SKIP'
@@ -34,23 +34,20 @@ pkgver() {
 	}
 
 	prepare() {
-		#verify PKGBUILD signature
-		#gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
-		mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin
-		ln -rTsf ${srcdir}/${_pkgname} ${srcdir}/go/src/${_pkggopath}
+		mkdir -p ${srcdir}/go/src/github.com/${_githuborg1}/ ${srcdir}/go/bin
+		ln -rTsf ${srcdir}/${_pkgname1} ${srcdir}/go/src/${_pkggopath1}
 	}
-
+#build binary from the skycoin sources with newcoin using ness fiber.toml.
 build() {
 	export GOPATH=${srcdir}/go
 	export GOBIN=${GOPATH}/bin
   export CC=musl-gcc
   export CGO_ENABLED=1
-  [[ -f ${srcdir}/${_pkgname}/fiber.toml ]] && mv ${srcdir}/${_pkgname}/fiber.toml ${srcdir}/${_pkgname}/fiber.toml.bak
-  cp ${srcdir}/fiber.toml ${srcdir}/${_pkgname}/fiber.toml
-	_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
-cd ${srcdir}/go/src/${_pkggopath}/
-skycoin-newcoin createcoin --coin ${_pkgname1}
-#  _buildbins address_gen
+  mv ${srcdir}/${_pkgname}/fiber.toml ${srcdir}/${_pkgname1}/fiber.toml
+	_cmddir=${srcdir}/go/src/${_pkggopath1}/cmd
+  cd ${srcdir}/go/src/${_pkggopath1}/
+  go run cmd/newcoin/newcoin.go createcoin --coin ${_pkgname}
+  #_buildbins address_gen
   _buildbins cipher-testdata
   _buildbins monitor-peers
   _buildbins newcoin
@@ -63,22 +60,18 @@ skycoin-newcoin createcoin --coin ${_pkgname1}
 }
 
 _buildbins() {
-
 _binname=$1
 _msg2 "building ${_binname} binary"
-#SPEED UP TESTING OF BUILDS
-if [[ ! -f ${GOBIN}/${_binname} ]] ; then
 	cd ${_cmddir}/${_binname}
   go build -trimpath --ldflags '-linkmode external -extldflags "-static" -buildid=' -o $GOBIN/ .
-fi
 }
-
+#package includes the privateness gui sources
 package() {
 	#create directory trees
 	_nesssrcdir=${srcdir}/${_pkgname}
-	_nesspath=${pkgdir}/opt/${_pkgname1}
-	_nessgobin=${_nesspath}/bin
-	_nessguidir=${_nesspath}/src/gui
+  _nesspath=${pkgdir}/opt/${_pkgname}
+  _nessgobin=${_nesspath}/bin
+  _nessguidir=${_nesspath}/src/gui
 	mkdir -p ${pkgdir}/usr/bin
 	mkdir -p ${_nessgobin}
 	mkdir -p ${_nessguidir}
@@ -99,9 +92,9 @@ package() {
 	#install the scripts
 	#_nessscripts=$( ls --ignore=*.service ${srcdir}/${_pkgname}-scripts/ )
 	#for i in $_nessscripts; do
-		install -Dm755 ${srcdir}/ness-wallet.sh ${_nessgobin}/ness-wallet
-		ln -rTsf ${_nessgobin}/ness-wallet ${pkgdir}/usr/bin/ness-wallet
-		chmod 755 ${pkgdir}/usr/bin/ness-wallet
+	install -Dm755 ${srcdir}/ness-wallet.sh ${_nessgobin}/ness-wallet
+	ln -rTsf ${_nessgobin}/ness-wallet ${pkgdir}/usr/bin/ness-wallet
+	chmod 755 ${pkgdir}/usr/bin/ness-wallet
 	#done
   #_msg2 'installing systemd services'
   #install the system.d service