fix signature, updated scripts

6 files changed, 79 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 957ce63741b6..9c9181f03166 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire-mainnet
 	pkgdesc = Skywire: Building a New Internet. Skycoin.com
 	pkgver = autogenerated
-	pkgrel = 3
+	pkgrel = 5
 	url = https://github.com/SkycoinProject/skywire-mainnet
 	arch = any
 	makedepends = git
@@ -9,11 +9,17 @@ pkgbase = skywire-mainnet
 	makedepends = skycoin-keyring
 	provides = skywire
 	conflicts = skywire
-	source = git+https://github.com/SkycoinProject/skywire-mainnet.git#branch=milestone2
+	source = git+https://github.com/SkycoinProject/skywire-mainnet.git#branch=develop
+	source = skywire-scripts.tar.gz
+	source = skywire-systemd.tar.gz
+	source = hypervisorconfigPKGBUILD
 	source = PKGBUILD.sig
 	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
 	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
 	sha256sums = SKIP
+	sha256sums = 9a63489b8f1392a57e137f3b777089e555f3178983f98cbd0c310e48929124de
+	sha256sums = 8b56a49c87eac95701c46fae8debfa76676a66fbe139d6a9cd87fa1b8830cf47
+	sha256sums = 4b6e76c95d8f21ffe6c012403306e61883c45b7d08fc36a70e979d1160dd22cb
 	sha256sums = SKIP
 
 pkgname = skywire-mainnet
diff --git a/PKGBUILD b/PKGBUILD
index 6c9e6f33a59b..3e66d3048a7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,21 +8,28 @@ pkgdesc="Skywire: Building a New Internet. Skycoin.com"
 pkgver='autogenerated'
 #pkgver='autogenerated'
 pkggopath="github.com/${githuborg}/${pkgname}"
-pkgrel=3
-#pkgrel=3
+pkgrel=5
+#pkgrel=5
 arch=('any')
 url="https://${pkggopath}"
 license=()
 makedepends=(git go skycoin-keyring)
 provides=('skywire')
 conflicts=('skywire')
-source=("git+${url}.git#branch=${BRANCH:-milestone2}"
+source=("git+${url}.git#branch=${BRANCH:-develop}"
+"skywire-scripts.tar.gz"
+"skywire-systemd.tar.gz"
+"hypervisorconfigPKGBUILD"
 "PKGBUILD.sig")
 sha256sums=('SKIP'
+            '9a63489b8f1392a57e137f3b777089e555f3178983f98cbd0c310e48929124de'
+            '8b56a49c87eac95701c46fae8debfa76676a66fbe139d6a9cd87fa1b8830cf47'
+            '4b6e76c95d8f21ffe6c012403306e61883c45b7d08fc36a70e979d1160dd22cb'
             'SKIP')
 validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
                            '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
-
+#tar -czvf skywire-scripts.tar.gz skywire-scripts
+#tar -czvf skywire-systemd.tar.gz skywire-systemd
 export GOOS=linux
 export GOPATH="${srcdir}"
 export GOROOT="$builddir"
@@ -105,9 +112,9 @@ build() {
 	cd ${cmddir}/hypervisor
   msg2 'building hypervisor binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-	cd ${cmddir}/dmsgpty
-  msg2 'building dmsgpty binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+#	cd ${cmddir}/dmsgpty
+#  msg2 'building dmsgpty binary'
+#  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   #binary transparency
   cd $GOBIN
   msg2 'binary sha256sums'
@@ -123,25 +130,51 @@ package() {
   #create directory trees
   mkdir -p ${pkgdir}/usr/bin
   mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
-  mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
+  mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname}/static
+  mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname}/hypervisorconfig/
+  #mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname}/setup-node
+  export GOPATH=${pkgdir}/usr/lib/${projectname}/go
+	export GOBIN=${pkgdir}/usr/lib/${projectname}/go/bin
 	#NOT putting the sources in /usr/lib/skycoin/skywire for size considerations
-	#cp -r ${srcdir}/${pkgname1}/ ${pkgdir}/usr/lib/${projectname}/
+	cp -r ${srcdir}/${pkgname}/static/skywire-manager-src ${pkgdir}/usr/lib/${projectname}/${pkgname}/static/skywire-manager-src
+#  cd ${pkgdir}/usr/lib/${projectname}/${pkgname}/static/skywire-manager-src
+#  npm install --user root
+#  find ${pkgdir}/usr/lib/${projectname}/${pkgname} -type d -exec chmod 755 {} +
+  # npm gives ownership of ALL FILES to build user
+#  chown -R root:root "$pkgdir"
   msg2 'installing binaries'
   skybins="${srcdir}"/go/bin
   #ln -rTsf ${skybins}/manager-node ${skybins}/${pkgname1}-manager-node
   skywirebins=$( ls ${skybins} )
   for i in ${skywirebins}; do
-    install -Dm755 ${srcdir}/go/bin/${i} ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
-    ln -rTsf ${pkgdir}/usr/lib/${projectname}/go/bin/${i} ${pkgdir}/usr/bin/${i}
-    chmod 755 ${pkgdir}/usr/bin/${i}
+    install -Dm755 ${srcdir}/go/bin/${i} ${GOBIN}/${i}
+    ln -rTsf ${GOBIN}/${i}  ${pkgdir}/usr/bin/${i}
+    chmod 755 ${GOBIN}/${i}
   done
+
+  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire-halt.sh ${GOBIN}/skywire-halt.sh
+	ln -rTsf ${GOBIN}/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
+
+  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire-mainnet.sh ${GOBIN}/skywire-mainnet.sh
+	ln -rTsf ${GOBIN}/skywire-mainnet.sh ${pkgdir}/usr/bin/skywire-mainnet
+
+  install -Dm755 "${srcdir}/${pkgname1}-scripts/skywire-mainnet-config.sh" "${GOBIN}/skywire-mainnet-config.sh"
+	ln -rTsf "${GOBIN}/skywire-mainnet-config.sh" "${pkgdir}/usr/bin/skywire-mainnet-config"
+
+  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire-setuser.sh ${GOBIN}/skywire-setuser.sh
+	ln -rTsf ${GOBIN}/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
+
+  chmod 755 ${pkgdir}/usr/lib/${projectname}/go/bin/*
+  install -Dm644  ${srcdir}/hypervisorconfigPKGBUILD  ${pkgdir}/usr/lib/${projectname}/${pkgname}/hypervisorconfig/PKGBUILD
 #prepend name to the symlinks
 	cd ${pkgdir}/usr/bin/
-	mv dmsgpty ${pkgname1}-dmsgpty
+	#mv dmsgpty ${pkgname1}-dmsgpty
 	mv helloworld ${pkgname1}-helloworld
 	mv hypervisor ${pkgname1}-hypervisor
 	mv setup-node ${pkgname1}-setup-node
 	mv skychat ${pkgname1}-skychat
 	mv skysocks ${pkgname1}-skysocks
 	mv skysocks-client ${pkgname1}-skysocks-client
+  #install the system.d services
+	install -Dm644 ${srcdir}/${pkgname1}-systemd/${pkgname1}.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}.service
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index 6b6df1021b07..3b9e0ea85d0b 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig
diff --git a/hypervisorconfigPKGBUILD b/hypervisorconfigPKGBUILD
new file mode 100644
index 000000000000..1ef96bf0111f
--- /dev/null
+++ b/hypervisorconfigPKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
+# Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
+projectname=skycoin
+pkgname=hypervisorconfig
+pkgname1=skywire
+githuborg=SkycoinProject
+pkgdesc="Skywire: Building a New Internet. Skycoin.com"
+pkgver='autogenerated'
+#pkgver='autogenerated'
+pkggopath="github.com/${githuborg}/skywire-mainnet/${pkgname}"
+pkgrel=1
+arch=('any')
+url="https://${pkggopath}"
+license=()
+makedepends=()
+source=("hypervisorinfo.txt")
+sha256sums=('SKIP')
+
+pkgver() {
+	date +%d%m%Y
+}
+
+package() {
+install -Dm644 ${srcdir}/hypervisorinfo.txt  ${pkgdir}/usr/lib/skycoin/skywire-mainnet/${pkgname}/hypevisorinfo.txt
+}
diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz
new file mode 100644
index 000000000000..9e31bd0fa624
--- /dev/null
+++ b/skywire-scripts.tar.gz
diff --git a/skywire-systemd.tar.gz b/skywire-systemd.tar.gz
new file mode 100644
index 000000000000..52977bf3e9d2
--- /dev/null
+++ b/skywire-systemd.tar.gz