summarylogtreecommitdiffstats
path: root/git.PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'git.PKGBUILD')
-rw-r--r--git.PKGBUILD74
1 files changed, 30 insertions, 44 deletions
diff --git a/git.PKGBUILD b/git.PKGBUILD
index 98d69fbe4c69..54e94d925d7a 100644
--- a/git.PKGBUILD
+++ b/git.PKGBUILD
@@ -7,27 +7,26 @@ _githuborg=${_projectname}
pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
_pkggopath="github.com/${_githuborg}/${_pkgname}"
pkgver='autogenerated'
-pkgrel=5
-#pkgrel=5
+pkgrel=1
+#pkgrel=7
arch=( 'i686' 'x86_64' 'aarch64' 'armv8' 'armv7' 'armv7l' 'armv7h' 'armv6h' 'armhf' 'armel' 'arm' )
url="https://${_pkggopath}"
license=()
makedepends=('git' 'go' 'musl' 'kernel-headers-musl')
install=skywire.install
_scripts=${_pkgname}-scripts
-source=("git+${url}.git#branch=${BRANCH:-develop}"
-"${url}/raw/develop/dmsghttp-config.json"
+source=("git+${url}.git#branch=develop"
"${_scripts}.tar.gz"
)
sha256sums=('SKIP'
- 'dcb3b8bc1f6fa58dd64b95045b8b010489352c815f737bf2cbf8812973a8dc49'
- '791c5157f794248a67c3aba25084f1472f0422dd2cfaaa889da293c1de4c7c3f')
+ 'fa04907d07072130098fe662ec317b658acf62f110b9c185d4b77b6afa4ffe08')
pkgver() {
-cd ${srcdir}/${_pkgname}
-local _version=$(make version)
+_version=$(git ls-remote --tags --refs --sort="version:refname" ${url}.git | tail -n1)
+_version=${_version##*/}
_version=${_version%%-*}
-echo ${_version//v/}
+_version=${_version//v/}
+echo ${_version}
}
prepare() {
@@ -54,8 +53,6 @@ BUILDINFO=${BUILDINFO_VERSION} ${BUILDINFO_DATE} ${BUILDINFO_COMMIT}
#create the skywire binaries
cd ${srcdir}/go/src/${_pkggopath}
-#git fetch
-#git checkout develop
_cmddir=${srcdir}/go/src/${_pkggopath}/cmd
_msg2 "building skychat binary"
@@ -106,22 +103,27 @@ mkdir -p ${_pkgdir}/${_skydir}/bin
mkdir -p ${_pkgdir}/${_skydir}/apps
mkdir -p ${_pkgdir}/${_skydir}/local
mkdir -p ${_pkgdir}/${_skydir}/scripts
+mkdir -p ${_pkgdir}/${_systemddir}
_msg2 'installing binaries'
-_skywirebins=$( ls ${srcdir}/go/bin )
-for i in ${_skywirebins}; do
- _install2 ${srcdir}/go/bin/${i} ${_skybin}
+ install -Dm755 ${GOBIN}/* ${_pkgdir}/${_skybin}/
+for _i in ${_pkgdir}/${_skybin}/* ; do
+ ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/}
done
-_msg2 'installing apps'
-_skywireapps=$( ls ${srcdir}/go/apps )
-for i in ${_skywireapps}; do
- _install2 ${srcdir}/go/apps/${i} ${_skyapps}
+
+_msg2 'installing app binaries'
+_apps=${pkgdir}/test/apps
+install -Dm755 ${_GOAPPS}/* ${_pkgdir}/${_skyapps}/
+for _i in ${_pkgdir}/${_skyapps}/* ; do
+ ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/}
done
-_msg2 'installing scripts'
-_skywirescripts=$( ls ${srcdir}/${_scripts}/${_pkgname} )
-for i in ${_skywirescripts}; do
- _install2 ${srcdir}/${_scripts}/${_pkgname}/${i} ${_skyscripts}
+
+_msg2 'Installing scripts'
+install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/* ${_pkgdir}/${_skyscripts}/
+for _i in ${_pkgdir}/${_skyscripts}/* ; do
+ ln -rTsf ${_i} ${_pkgdir}/usr/bin/${_i##*/}
done
+
chmod +x ${_pkgdir}/usr/bin/*
#rename visor to skywire - matche the skycoin / skycoin-cli of the skycoin wallet
[[ -f ${_pkgdir}/usr/bin/${_pkgname}-visor ]] && ln -rTsf ${_pkgdir}/usr/bin/${_pkgname}-visor ${_pkgdir}/usr/bin/${_pkgname}
@@ -130,30 +132,14 @@ _msg2 'installing dmsghttp-config.json'
install -Dm644 ${srcdir}/${_pkgname}/dmsghttp-config.json ${_pkgdir}/${_skydir}/dmsghttp-config.json
_msg2 'installing skywire systemd services'
-install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
-install -Dm644 ${srcdir}/${_scripts}/systemd/${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service
+install -Dm644 ${srcdir}/${_scripts}/systemd/* ${_pkgdir}/${_systemddir}/
-_msg2 'installing desktop files and icon'
+_msg2 'installing desktop files and icons'
+mkdir -p ${_pkgdir}/usr/share/applications/ ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/
install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywire.Skywire.desktop ${_pkgdir}/usr/share/applications/com.skywire.Skywire.desktop
-install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/${_skydir}/icon.png
-mkdir -p ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/
-ln -rTsf ${_pkgdir}/${_skydir}/icon.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png
-###STAGING AREA###
-#Install the correct autocofig script
-rm ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig
-install -Dm755 ${srcdir}/${_scripts}/${_pkgname}/.${_pkgname}-autoconfig-git.sh ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig
-ln -rTsf ${_pkgdir}/${_skyscripts}/${_pkgname}-autoconfig ${_pkgdir}/usr/bin/${_pkgname}-autoconfig
-#Install the updated systemd services
-install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}.service ${_pkgdir}/${_systemddir}/${_pkgname}.service
-install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-visor.service ${_pkgdir}/${_systemddir}/${_pkgname}-visor.service
-install -Dm644 ${srcdir}/${_scripts}/systemd/.${_pkgname}-user.service ${_pkgdir}/${_systemddir}/${_pkgname}-user.service
-}
-
-_install2() {
-_binname="${1##*/}"
-_binname="${_binname%%.*}"
-install -Dm755 ${1} ${_pkgdir}/${2}/${_binname}
-ln -rTsf ${_pkgdir}/${2}/${_binname} ${_pkgdir}/usr/bin/${_binname}
+install -Dm644 ${srcdir}/${_scripts}/desktop/com.skywirevpn.SkywireVPN.desktop ${_pkgdir}/usr/share/applications/com.skywirevpn.SkywireVPN.desktop
+install -Dm644 ${srcdir}/${_scripts}/desktop/skywire.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywire.png
+install -Dm644 ${srcdir}/${_scripts}/desktop/skywirevpn.png ${_pkgdir}/usr/share/icons/hicolor/48x48/apps/skywirevpn.png
}
_msg2() {