update to build from git sources

1 files changed, 41 insertions, 40 deletions

diff --git a/PKGBUILD b/PKGBUILD
index bd67d0d0eb0d..7d09c387863a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
-projectname=skycoin
+_projectname=skycoin
 pkgname=skywire
-pkgname1=skywire
-githuborg=SkycoinProject
+_pkgname=${pkgname}
+_pkgname1=${_pkgname}-mainnet
+_githuborg=SkycoinProject
 pkgdesc="Skywire: Building a New Internet. Skycoin.com"
+_pkggopath="github.com/${_githuborg}/${_pkgname1}"
 pkgver='autogenerated'
 #pkgver='autogenerated'
 pkgrel=1
 #pkgrel=1
 arch=('any')
-pkggopath="github.com/${githuborg}/skywire-mainnet"
-url="https://${pkggopath}"
+url="https://${_pkggopath}"
 group=skycoinproject
 license=()
 makedepends=(git go npm python python2 skycoin-keyring)
@@ -29,10 +30,10 @@ validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_na
 #tar -czvf skywire-scripts.tar.gz skywire-scripts
 #updatepkgsums
 export GOOS=linux
-export GOPATH="${srcdir}"
-export GOROOT="$builddir"
-export GOBIN="$GOROOT"/bin
-export GOROOT_FINAL=/usr/lib/go
+#export GOPATH="${srcdir}"
+#export GOROOT="$builddir"
+#export GOBIN="$GOROOT"/bin
+#export GOROOT_FINAL=/usr/lib/go
 
 export CGO_ENABLED=1
 
@@ -53,7 +54,7 @@ mipsel)   export GOARCH="mipsle" ;;
 	esac
 
 pkgver() {
-	cd "${srcdir}/skywire-mainnet"
+	cd "${srcdir}/${_pkgname1}"
   local version=$(git describe --abbrev=0 | tr --delete v)
 	local version=${version//-/_}
 	local date=$(git log -1 --format="%cd" --date=short | sed s/-//g)
@@ -67,9 +68,9 @@ prepare() {
 	gpg --verify ../PKGBUILD.sig ../PKGBUILD
 
   # https://wiki.archlinux.org/index.php/Go_package_guidelines
-	mkdir -p ${srcdir}/go/src/github.com/${githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
-  ln -rTsf ${srcdir}/skywire-mainnet ${srcdir}/go/src/${pkggopath}
-  cd ${srcdir}/go/src/${pkggopath}/
+	mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin ${srcdir}/go/apps
+  ln -rTsf ${srcdir}/${_pkgname1} ${srcdir}/go/src/${_pkggopath}
+  cd ${srcdir}/go/src/${_pkggopath}/
   #export GOPATH="${srcdir}"/go
   #export GOBIN=${GOPATH}/bin
   #export PATH=${GOPATH}/bin:${PATH}
@@ -80,35 +81,35 @@ build() {
   export GOBIN=${GOPATH}/bin
   export GOAPPS=${GOPATH}/apps
   export PATH=${GOPATH}/bin:${PATH}
-  cd ${srcdir}/go/src/${pkggopath}
+  cd ${srcdir}/go/src/${_pkggopath}
   #build hypervisor UI
   make install-deps-ui
   make lint-ui
   make build-ui
   #build binaries
-	cmddir=${srcdir}/go/src/${pkggopath}/cmd
+  _cmddir=${srcdir}/go/src/${_pkggopath}/cmd
   #using go build for determinism
-	cd ${cmddir}/apps/skychat
   msg2 'building skychat binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
-  cd ${cmddir}/apps/skysocks
+	cd ${_cmddir}/apps/skychat
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
   msg2 'building skysocks binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
-  cd ${cmddir}/apps/skysocks-client
+  cd ${_cmddir}/apps/skysocks
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
   msg2 'building skysocks-client binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
-  cd ${cmddir}/skywire-visor
+  cd ${_cmddir}/apps/skysocks-client
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOAPPS/ .
   msg2 'building skywire-visor binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/skywire-cli
+  cd ${_cmddir}/skywire-visor
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   msg2 'building skywire-cli binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-	cd ${cmddir}/setup-node
+  cd ${_cmddir}/skywire-cli
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   msg2 'building setup-node binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-	cd ${cmddir}/hypervisor
+	cd ${_cmddir}/setup-node
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   msg2 'building hypervisor binary'
-  go build -mod=mod -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
+	cd ${_cmddir}/hypervisor
+  go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
   #binary transparency
   cd $GOBIN
   msg2 'binary sha256sums'
@@ -125,24 +126,24 @@ package() {
   #create directory trees
   mkdir -p ${pkgdir}/usr/bin/apps
   msg2 'installing binaries'
-  skywirebins=$( ls ${GOBIN} )
-  for i in ${skywirebins}; do
+  _skywirebins=$( ls ${GOBIN} )
+  for i in ${_skywirebins}; do
     install -Dm755 ${GOBIN}/${i} ${pkgdir}/usr/bin/${i}
   done
-  skywireapps=$( ls ${GOAPPS} )
-  for i in ${skywireapps}; do
+  _skywireapps=$( ls ${GOAPPS} )
+  for i in ${_skywireapps}; do
     install -Dm755 ${GOAPPS}/${i} ${pkgdir}/usr/bin/apps/${i}
   done
   #install scripts
-  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
-  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire.sh ${pkgdir}/usr/bin/skywire
-  install -Dm755 ${srcdir}/${pkgname1}-scripts/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
-  install -Dm644  ${srcdir}/${pkgname1}-scripts/hypervisorconfig.PKGBUILD  ${pkgdir}/usr/lib/${projectname}/${pkgname1}/hypervisorconfig/PKGBUILD
+  install -Dm755 ${srcdir}/${_pkgname}-scripts/skywire-halt.sh ${pkgdir}/usr/bin/skywire-halt
+  install -Dm755 ${srcdir}/${_pkgname}-scripts/skywire.sh ${pkgdir}/usr/bin/skywire
+  install -Dm755 ${srcdir}/${_pkgname}-scripts/skywire-setuser.sh ${pkgdir}/usr/bin/skywire-setuser
+  install -Dm644  ${srcdir}/${_pkgname}-scripts/hypervisorconfig.PKGBUILD  ${pkgdir}/usr/lib/${_projectname}/${_pkgname}/hypervisorconfig/PKGBUILD
 	cd ${pkgdir}/usr/bin/
-	mv hypervisor ${pkgname1}-hypervisor
+	mv hypervisor ${_pkgname}-hypervisor
   #install the system.d services
-  install -Dm644 ${srcdir}/go/src/${pkggopath}/init/${pkgname1}-hypervisor.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-hypervisor.service
-  install -Dm644 ${srcdir}/go/src/${pkggopath}/init/${pkgname1}-visor.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-visor.service
+  install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-hypervisor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-hypervisor.service
+  install -Dm644 ${srcdir}/go/src/${_pkggopath}/init/${_pkgname}-visor.service ${pkgdir}/usr/lib/systemd/system/${_pkgname}-visor.service
 	#tls key and certificate generation
 	install -Dm755 ${srcdir}/${_pkgname}-scripts/generate.sh ${pkgdir}/usr/lib/skycoin/skywire/ssl/generate.sh
   ln -rTsf ${pkgdir}/usr/lib/skycoin/skywire/ssl/generate.sh ${pkgdir}/usr/bin/skywire-tls-gen