omit scripts for now

4 files changed, 90 insertions, 126 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1992195b361f..2c2adc3fb0b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,31 @@
 pkgbase = skywire
-	pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.com
-	pkgver = autogenerated
-	pkgrel = 7
-	url = https://github.com/SkycoinProject/skywire
-	arch = any
+	pkgdesc = Skywire: Building a New Internet. Skycoin.com
+	pkgver = 0.2.0
+	pkgrel = 1
+	url = https://github.com/SkycoinProject/skywire-mainnet
+	arch = x86_64
+	arch = aarch64
+	arch = armv7
+	arch = armv8
 	makedepends = git
-	makedepends = go
 	makedepends = skycoin-keyring
-	provides = skywire
-	conflicts = skywire-mainnet
-	source = git+https://github.com/SkycoinProject/skywire.git#branch=master
+	source = git+https://github.com/SkycoinProject/skybian.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 = d7b865e9b794d0889c1044cee25d1c1aad1fdd2c4256da18c11b3b19e218224a
-	sha256sums = 5b110b1ce7544d46f52934b742fcb819dbfc50c78702e93a1efa3246d14af45b
+	sha256sums = a5f90034db1b199a3fede6b2b23453e234aa366c1ee06dbe3ddfc16f26a0c3a7
+	sha256sums = 399926d8addcde6bb588a67739971525f953060b83693cb2a7a081480c4c5091
 	sha256sums = SKIP
+	source_x86_64 = https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-amd64.tar.gz
+	sha256sums_x86_64 = 988a9925b1650424a97836951b284e633fc78e857b908d65e40cbf6d18eb96d7
+	source_aarch64 = https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz
+	sha256sums_aarch64 = 6ebadb2b6dbba87a060993560fe957d617f40ca7e467129889d51baebe57fa47
+	source_armv7 = https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-armv7.tar.gz
+	source_armv8 = https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz
+	sha256sums_armv8 = 5ee60c5b7ce63999520167ab44b7f3b7a2328ea9ebbbabe043cc5245b50d5a81
 
 pkgname = skywire
 	options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 9e7e047f34a8..aa90d82f2403 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,136 +2,68 @@
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 projectname=skycoin
 pkgname=skywire
-pkgname1=skywire
 githuborg=SkycoinProject
-pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.com"
-pkgver='autogenerated'
-#pkgver='autogenerated'
-pkggopath="github.com/${githuborg}/${pkgname1}"
-pkgrel=7
-#pkgrel=7
-arch=('any')
+pkgdesc="Skywire: Building a New Internet. Skycoin.com"
+pkgver=0.2.0
+pkggopath="github.com/${githuborg}/${pkgname}-mainnet"
+pkgrel=1
+arch=('x86_64' 'aarch64' 'armv7' 'armv8')
 url="https://${pkggopath}"
 license=()
-makedepends=(git go skycoin-keyring)
-provides=('skywire')
-conflicts=('skywire-mainnet')
-source=("git+${url}.git#branch=${BRANCH:-master}"
+makedepends=(git skycoin-keyring)
+#source=("git+${url}.git#branch=${BRANCH:-develop}"
+source=("git+https://github.com/SkycoinProject/skybian.git#branch=${BRANCH:-develop}"
 "skywire-scripts.tar.gz"
-"skywire-systemd.tar.gz"
+"hypervisorconfigPKGBUILD"
 "PKGBUILD.sig")
 sha256sums=('SKIP'
-            'd7b865e9b794d0889c1044cee25d1c1aad1fdd2c4256da18c11b3b19e218224a'
-            '5b110b1ce7544d46f52934b742fcb819dbfc50c78702e93a1efa3246d14af45b'
-            'SKIP')
-validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
-                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
+'a5f90034db1b199a3fede6b2b23453e234aa366c1ee06dbe3ddfc16f26a0c3a7'
+'399926d8addcde6bb588a67739971525f953060b83693cb2a7a081480c4c5091'
+'SKIP')
+source_x86_64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-amd64.tar.gz")
+sha256sums_x86_64=('988a9925b1650424a97836951b284e633fc78e857b908d65e40cbf6d18eb96d7')
+source_aarch64=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
+sha256sums_aarch64=('5ee60c5b7ce63999520167ab44b7f3b7a2328ea9ebbbabe043cc5245b50d5a81')
+source_armv7=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-armv7.tar.gz")
+sha256sums_aarch64=('6ebadb2b6dbba87a060993560fe957d617f40ca7e467129889d51baebe57fa47')
+source_armv8=("https://github.com/SkycoinProject/skywire-mainnet/releases/download/v0.2.0/skywire-v0.2.0-linux-arm64.tar.gz")
+sha256sums_armv8=('5ee60c5b7ce63999520167ab44b7f3b7a2328ea9ebbbabe043cc5245b50d5a81')
 
+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 CGO_ENABLED=0
 
-case "$CARCH" in
-x86)      export GOARCH="386" GO386="387" ;;
-x86_64)   export GOARCH="amd64" ;;
-arm*)     export GOARCH="arm" ;;
-armel)    export GOARCH="arm" GOARM="5" ;;
-armhf)    export GOARCH="arm" GOARM="6" ;;
-armv7)    export GOARCH="arm" GOARM="7" ;;
-armv8)    export GOARCH="arm64" ;;
-aarch64)  export GOARCH="arm64" ;;
-mips)     export GOARCH="mips" ;;
-mips64)   export GOARCH="mips64" ;;
-mips64el) export GOARCH="mips64le" ;;
-mipsel)   export GOARCH="mipsle" ;;
-*)        return 1 ;;
-	esac
-
-pkgver() {
-	cd ${srcdir}/${pkgname1}
-	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)
-	echo "${date}.${count}_${commit}"
-}
 
 prepare() {
 	#verify PKGBUILD signature
 	gpg --verify ${srcdir}/PKGBUILD.sig ../PKGBUILD
 	# https://wiki.archlinux.org/index.php/Go_package_guidelines
-	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin
-	ln -rTsf ${srcdir}/${pkgname1} ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}
-	cd ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd
-	git checkout master
-	git submodule --quiet update --init --recursive
 }
 
-build() {
-  export GOPATH=${srcdir}/go
-	export GOBIN=${GOPATH}/bin
-	export PATH=${GOPATH}/bin:${PATH}
-  cmddir=${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd
-  #using go build for determinism
-	cd ${cmddir}/skywire-manager
-  msg2 'building skywire-manager binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/skywire-node
-  msg2 'building skywire-node binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/socks/socksc
-  msg2 'building skywire-socksc binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/socks/sockss
-  msg2 'building skywire-sockss binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/ssh/sshc
-  msg2 'building skywire-sshc binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/ssh/sshs
-  msg2 'building skywire-sshs binary'
-  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  #binary transparency
-  cd $GOBIN
-  msg2 'binary sha256sums'
-  sha256sum $(ls)
-}
 
 package() {
-	options=(!strip staticlibs)
-	#create directory trees
-	mkdir -p ${pkgdir}/usr/bin
-	mkdir -p ${pkgdir}/usr/lib/${projectname}/go/bin
-	mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-	#restate go envs
-	export GOPATH=${pkgdir}/usr/lib/${projectname}/go
-	export GOBIN=${pkgdir}/usr/lib/${projectname}/go/bin
-	#install binaries & symlink to /usr/bin
-	msg2 'installing binaries'
-	skybins=${srcdir}/go/bin
-	#collect the binaries & install
-	skywirebins=$(ls $srcdir/go/bin/)
-	for i in ${skywirebins}; do
-		install -Dm755 ${srcdir}/go/bin/${i} ${GOBIN}/${i}
-		ln -rTsf ${GOBIN}/${i} ${pkgdir}/usr/bin/${pkgname1}-${i}
-		chmod 755 ${GOBIN}/${i}
-	done
-	mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-manager ${pkgdir}/usr/bin/${pkgname1}-manager
-	mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-node ${pkgdir}/usr/bin/${pkgname1}-node
-	#install the web dir
-	cp -r ${srcdir}/${pkgname1}/static ${pkgdir}/usr/lib/${projectname}/${pkgname1}/
-	mkdir -p ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}
-	#install the docs
-	cp -r ${srcdir}/${pkgname1}/docs/api ${pkgdir}/usr/share/doc/${projectname}/${pkgname1}-manager
-	#install the scripts
-	skywirescripts=$(ls $srcdir/$pkgname1-scripts/)
-	for i in ${skywirescripts}; do
-		install -Dm755 ${srcdir}/${pkgname1}-scripts/${i} ${GOBIN}/${i}
-		ln -rTsf ${GOBIN}/${i} ${pkgdir}/usr/bin/${i}
-		chmod 755 ${pkgdir}/usr/lib/${projectname}/go/bin/${i}
-	done
-	#install the system.d services
-	install -Dm644 ${srcdir}/${pkgname1}-systemd/${pkgname1}-manager.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-manager.service
-	install -Dm644 ${srcdir}/${pkgname1}-systemd/${pkgname1}-node.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node.service
+    options=(!strip staticlibs)
+  #create directory trees
+  mkdir -p ${pkgdir}/usr/bin/apps
+  mkdir -p ${pkgdir}/etc/skywire
+  mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname}/hypervisorconfig/
+  #mkdir -p ${pkgdir}/usr/lib/${projectname}/${pkgname}/setup-node
+
+  msg2 'installing binaries'
+  install -Dm755 ${srcdir}/hypervisor ${pkgdir}/usr/bin/skywire-hypervisor
+  install -Dm755 ${srcdir}/skywire-visor ${pkgdir}/usr/bin/skywire-visor
+  install -Dm755 ${srcdir}/skywire-cli ${pkgdir}/usr/bin/skywire-cli
+  install -Dm755 ${srcdir}/apps/skychat ${pkgdir}/usr/bin/apps/skychat
+  install -Dm755 ${srcdir}/apps/skysocks ${pkgdir}/usr/bin/apps/skysocks
+  install -Dm755 ${srcdir}/apps/skysocks-client ${pkgdir}/usr/bin/apps/skysocks-client
+#  install -Dm755 ${srcdir}/skybian/static/skywire-startup ${pkgdir}/usr/bin/apps/skywire-startup
+#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
+#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-config.sh ${pkgdir}/usr/bin/skywire-config
+#  install -Dm755 ${srcdir}/${pkgname}-scripts/hypervisor-config.sh ${pkgdir}/usr/bin/hypervisor-config
+#  install -Dm755 ${srcdir}/${pkgname}-scripts/skywire-user-config.sh ${pkgdir}/usr/bin/skywire-user-config
+
+#install hypervisorconfig PKGBUILD
+#  install -Dm644  ${srcdir}/hypervisorconfigPKGBUILD  ${pkgdir}/usr/lib/${projectname}/${pkgname}/hypervisorconfig/PKGBUILD
+  #install the system.d services
+#	install -Dm644 ${srcdir}/skybian/static/skywire-startup.service ${pkgdir}/usr/lib/systemd/system/skywire-startup.service
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index c36fc2751860..7006dbb19d7e 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig
diff --git a/hypervisorconfigPKGBUILD b/hypervisorconfigPKGBUILD
new file mode 100644
index 000000000000..92bd38a86c10
--- /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}/hypervisorinfo.txt
+}