update to use newcoin

2 files changed, 29 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 39b2c6fbda4b..be6984a1e31f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = privateness
 	pkgdesc = NESS Core and Wallet. privateness.network
-	pkgver = autogenerated
+	pkgver = 20210502.9396_3744c21d5
 	pkgrel = 1
-	url = https://github.com/NESS-Network/privateness
+	url = https://github.com/skycoin/skycoin
 	arch = x86_64
 	arch = aarch64
 	arch = armv8
@@ -17,9 +17,12 @@ pkgbase = privateness
 	makedepends = go
 	makedepends = musl
 	makedepends = kernel-headers-musl
-	source = git+https://github.com/NESS-Network/privateness.git
+	makedepends = skycoin
+	source = git+https://github.com/skycoin/skycoin.git
+	source = git+https://github.com/skycoin/skycoin.git
 	source = ness-wallet.sh
 	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 23babd4af4ebdff1fb914161bcec54cfa9307a5f26fc74ae388f5b131335efb2
 
 pkgname = privateness
diff --git a/PKGBUILD b/PKGBUILD
index b0efe5285a6e..7660dbcce0a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
-_pkgname=privateness
-pkgname=${_pkgname}
-_githuborg=NESS-Network
+_pkgname1=privateness
+_pkgname=skycoin
+pkgname=privateness
+_githuborg1=NESS-Network
+_githuborg=skycoin
 pkgdesc="NESS Core and Wallet. privateness.network"
-pkgver='autogenerated'
+pkgver=20210502.9396_3744c21d5
 #pkgver='autogenerated'
 pkgrel=1
-#pkgrel=1
+#pkgrel=2
 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}"
-makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
+url1="https://${_pkggopath1}"
+makedepends=('git' 'go' 'musl' 'kernel-headers-musl' 'skycoin')
 source=("git+${url}.git" ##branch=${BRANCH:-develop}"
+"git+${url}.git" ##branch=${BRANCH:-develop}"
 "ness-wallet.sh")
 sha256sums=('SKIP'
+            'SKIP'
             '23babd4af4ebdff1fb914161bcec54cfa9307a5f26fc74ae388f5b131335efb2')
-#validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
 
 #tar -czvf privateness-scripts.tar.gz privateness-scripts
 #updpkgsums
 
 pkgver() {
-		cd "${srcdir}/${pkgname}"
+		cd "${srcdir}/${_pkgname}"
 		local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
 		local count=$(git rev-list --count HEAD)
 		local commit=$(git rev-parse --short HEAD)
@@ -40,15 +45,18 @@ build() {
 	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
-
-  _buildbins address_gen
+cd ${srcdir}/go/src/${_pkggopath}/
+skycoin-newcoin createcoin --coin ${_pkgname1}
+#  _buildbins address_gen
   _buildbins cipher-testdata
   _buildbins monitor-peers
   _buildbins newcoin
   _buildbins privateness
-  _buildbins privateness-cli
-	#binary transparency
+  _buildbins skycoin-cli
+ #binary transparency
 	cd $GOBIN
 	_msg2 'binary sha256sums'
 	sha256sum $(ls)
@@ -68,7 +76,7 @@ fi
 package() {
 	#create directory trees
 	_nesssrcdir=${srcdir}/${_pkgname}
-	_nesspath=${pkgdir}/opt/${_pkgname}
+	_nesspath=${pkgdir}/opt/${_pkgname1}
 	_nessgobin=${_nesspath}/bin
 	_nessguidir=${_nesspath}/src/gui
 	mkdir -p ${pkgdir}/usr/bin
@@ -102,7 +110,8 @@ package() {
 	#correct symlink names
 	cd ${pkgdir}/usr/bin/
   mv newcoin privateness-newcoin
-  mv address_gen privateness-address-gen
+  mv skycoin-cli privateness-cli
+  #mv address_gen privateness-address-gen
   mv cipher-testdata privateness-cipher-testdata
   mv monitor-peers privateness-monitor-peers
   _msg2 'available binaries and scripts in /usr/bin :'