reformat PKGBUILD, change to the skycoin github repo (pending migration)

3 files changed, 48 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03a3a2097547..27cabca2f213 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
 pkgbase = skycoin
-	pkgdesc = Skycoin Cryptocurrency Wallet ; latest versioned release (compiled from source)
+	pkgdesc = Skycoin Cryptocurrency Wallet. Skycoin.com
 	pkgver = 0.27.0
-	pkgrel = 2
-	url = https://github.com/SkycoinProject/skycoin
+	pkgrel = 3
+	url = https://github.com/skycoin/skycoin
 	arch = any
 	makedepends = go
 	makedepends = skycoin-keyring
-	source = https://github.com/SkycoinProject/skycoin/archive/v0.27.0.tar.gz
+	source = https://github.com/skycoin/skycoin/archive/v0.27.0.tar.gz
 	source = skycoin-scripts.tar.gz
 	source = skycoin-systemd.tar.gz
 	source = PKGBUILD.sig
 	validpgpkeys = DE08F924EEE93832DABC642CA8DC761B1C0C0CFC
-	validpgpkeys = 98F934F04F9334B81DFA3398913BBD5206B19620
 	sha256sums = 2e6c47f058f6f459e6572e6acf3e34403cf14fdc0f2511a4238b7280aae2d026
 	sha256sums = ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23
 	sha256sums = d14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42
 	sha256sums = SKIP
 
 pkgname = skycoin
-	options = !strip
-	options = staticlibs
 
diff --git a/PKGBUILD b/PKGBUILD
index 1bbc0f94f8a8..acc53629a693 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,28 @@
 # Maintainer: Moses Narrow <moe_narrow@use.startmail.com>
 # Maintainer: Rudi [KittyCash] <rudi@skycoinmail.com>
 pkgname=skycoin
-pkgname1=skycoin
-projectname=skycoin
-githuborg=SkycoinProject
-pkgdesc="Skycoin Cryptocurrency Wallet ; latest versioned release (compiled from source)"
+_pkgname=${pkgname}
+_githuborg=${_pkgname}
+pkgdesc="Skycoin Cryptocurrency Wallet. Skycoin.com"
 pkgver=0.27.0
 #pkgver=0.27.0
-pkgrel=2
-#pkgrel=2
+pkgrel=3
+#pkgrel=3
 arch=('any')
 license=()
-pkggopath="github.com/${githuborg}/${pkgname1}"
-url="https://${pkggopath}"
+_pkggopath="github.com/${_githuborg}/${_pkgname}"
+url="https://${_pkggopath}"
 makedepends=(go skycoin-keyring)
 source=("${url}/archive/v${pkgver}.tar.gz"
-"${pkgname1}-scripts.tar.gz"
-"${pkgname1}-systemd.tar.gz"
+"${_pkgname}-scripts.tar.gz"
+"${_pkgname}-systemd.tar.gz"
 "PKGBUILD.sig")
 sha256sums=('2e6c47f058f6f459e6572e6acf3e34403cf14fdc0f2511a4238b7280aae2d026'
             'ca8344614b60e0d9d57b0eba4b44e0febc4addf83a54685539c45e08364b2d23'
             'd14d3d597b80a2b79e5edb7e956a7926ca7065230e87fdca026036888835ad42'
             'SKIP')
-validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC'  # Moses Narrow <moe_narrow@use.startmail.com>
-                           '98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
-
+validpgpkeys=('DE08F924EEE93832DABC642CA8DC761B1C0C0CFC')  # Moses Narrow <moe_narrow@use.startmail.com>
+                           #'98F934F04F9334B81DFA3398913BBD5206B19620') #iketheadore skycoin <luxairlake@protonmail.com>
 
 case "$CARCH" in
 x86)      export GOARCH="386" GO386="387" ;;
@@ -43,45 +41,33 @@ mipsel)   export GOARCH="mipsle" ;;
 	esac
 
 	prepare() {
-		#gpg --import key
 		#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/${pkggopath}
-		ln -rTsf ${srcdir}/${pkgname1}-${pkgver} ${srcdir}/go/src/${pkggopath}
-		#cd ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}
-		#git submodule --quiet update --init --recursive
-		#export GOPATH="${srcdir}"/go
-		#export GOBIN=${GOPATH}/bin
-		#export PATH=${GOPATH}/bin:${PATH}
-		#msg2 'installing go dependencies'
-		#dep init
-		#dep ensure
+		mkdir -p ${srcdir}/go/src/github.com/${_githuborg}/ ${srcdir}/go/bin
+		ln -rTsf ${srcdir}/${_pkgname}-${pkgver} ${srcdir}/go/src/${_pkggopath}
 	}
 
 build() {
 	export GOPATH="${srcdir}"/go
 	export GOBIN=${GOPATH}/bin
-	export PATH=${GOPATH}/bin:${PATH}
-	cmddir=${srcdir}/go/src/${pkggopath}/cmd
+	_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
   #using go build for determinism
-	cd ${cmddir}/address_gen
+	cd ${_cmddir}/address_gen
 	msg2 'building skycoin-address_gen binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/cipher-testdata
+  cd ${_cmddir}/cipher-testdata
 	msg2 'building skycoin-cipher-testdata binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/monitor-peers
+  cd ${_cmddir}/monitor-peers
 	msg2 'building skycoin-monitor-peers binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/newcoin
+  cd ${_cmddir}/newcoin
 	msg2 'building skycoin-newcoin binary'
 	go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/skycoin-cli
+  cd ${_cmddir}/skycoin-cli
   msg2 'building skycoin-cli binary'
 	go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
-  cd ${cmddir}/skycoin
+  cd ${_cmddir}/skycoin
 	msg2 'building skycoin binary'
   go build -trimpath -ldflags '-extldflags ${LDFLAGS}' -ldflags=-buildid= -o $GOBIN/ .
 	#binary transparency
@@ -91,46 +77,45 @@ build() {
 }
 
 package() {
-	options=(!strip staticlibs)
 	#create directory trees
-	skysrcdir=${srcdir}/${pkgname1}-${pkgver}
-	skypath=${pkgdir}/usr/lib/${projectname}
-	skygobin=${skypath}/go/bin
-	skyguidir=${skypath}/${pkgname1}/src/gui
+	_skysrcdir=${srcdir}/${_pkgname}-${pkgver}
+	_skypath=${pkgdir}/opt/${_pkgname}
+	_skygobin=${_skypath}/bin
+	_skyguidir=${_skypath}/${_pkgname}/src/gui
 	mkdir -p ${pkgdir}/usr/bin
-	mkdir -p ${skygobin}
-	mkdir -p ${skyguidir}
+	mkdir -p ${_skygobin}
+	mkdir -p ${_skyguidir}
 	#install binaries & symlink to /usr/bin
 	msg2 'installing binaries'
-	skybin="${srcdir}"/go/bin
+	_skybin="${srcdir}"/go/bin
 	#avoid generic names for binaries
 	#collect the binaries & install
-	skybins=$( ls "$skybin")
-	for i in $skybins; do
-		install -Dm755 ${srcdir}/go/bin/${i} ${skygobin}/${i}
-		ln -rTsf ${skygobin}/$i ${pkgdir}/usr/bin/${i}
+	_skybins=$( ls "$_skybin")
+	for i in $_skybins; do
+		install -Dm755 ${srcdir}/go/bin/${i} ${_skygobin}/${i}
+		ln -rTsf ${_skygobin}/$i ${pkgdir}/usr/bin/${i}
 		chmod 755 ${pkgdir}/usr/bin/${i}
 	done
 	#install the web dir (UI)
-	cp -r ${skysrcdir}/src/gui/static ${skyguidir}
+	cp -r ${_skysrcdir}/src/gui/static ${_skyguidir}
 	#install the scripts
-	cd ${srcdir}/${pkgname1}-scripts/
-	skycoinscripts=$( ls )
-	for i in $skycoinscripts; do
-		install -Dm755 ${srcdir}/${pkgname1}-scripts/${i} ${skygobin}/${i}
-		ln -rTsf ${skygobin}/${i} ${pkgdir}/usr/bin/${i}
+	cd ${srcdir}/${_pkgname}-scripts/
+	_skycoinscripts=$( ls )
+	for i in $_skycoinscripts; do
+		install -Dm755 ${srcdir}/${_pkgname}-scripts/${i} ${_skygobin}/${i}
+		ln -rTsf ${_skygobin}/${i} ${pkgdir}/usr/bin/${i}
 		chmod 755 ${pkgdir}/usr/bin/${i}
 	done
 	#correct symlink names
 	cd ${pkgdir}/usr/bin/
-	namechange=$(ls --ignore='skycoin*')
-	for i in $namechange; do
-		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/${pkgname1}-${i}
+	_namechange=$(ls --ignore='skycoin*')
+	for i in $_namechange; do
+		mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/${_pkgname}-${i}
 	done
 	#install the system.d service
-	cd ${srcdir}/${pkgname1}-systemd/
-	skysystemd=$( ls )
-	for i in $skysystemd; do
-	install -Dm644 ${srcdir}/${pkgname1}-systemd/${i} ${pkgdir}/usr/lib/systemd/system/${i}
+	cd ${srcdir}/${_pkgname}-systemd/
+	_skysystemd=$( ls )
+	for i in $_skysystemd; do
+	install -Dm644 ${srcdir}/${_pkgname}-systemd/${i} ${pkgdir}/usr/lib/systemd/system/${i}
 done
 }
diff --git a/PKGBUILD.sig b/PKGBUILD.sig
index 5ce20f6b35a6..819a0b89ed4d 100644
--- a/PKGBUILD.sig
+++ b/PKGBUILD.sig