diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 156 | ||||
| -rw-r--r-- | PKGBUILD.sig | bin | 566 -> 566 bytes | |||
| -rw-r--r-- | skywire-scripts.tar.gz | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | skywire-systemd.tar.gz | bin | 0 -> 3584 bytes |
5 files changed, 21 insertions, 141 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire pkgdesc = TESTNET Skywire: Building a New Internet. Skycoin.com pkgver = autogenerated - pkgrel = 2 + pkgrel = 1 url = https://github.com/SkycoinProject/skywire arch = any makedepends = git @@ -11,8 +11,12 @@ pkgbase = skywire conflicts = skywire-mainnet source = git+https://github.com/SkycoinProject/skywire.git#branch=master source = https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key + source = skywire-scripts.tar.gz + source = skywire-systemd.tar.gz sha256sums = SKIP sha256sums = 41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14 + sha256sums = 784d9b588b95c3df5a61328e662ead4108c097b44fccb1079f781d15e055a2f4 + sha256sums = 4b49b82e04abe3d51073e339fc133a52926cfc8d905d5fd6b823c0762f32451b pkgname = skywire options = !strip @@ -7,7 +7,7 @@ githuborg=SkycoinProject pkgdesc="TESTNET Skywire: Building a New Internet. Skycoin.com" pkgver='autogenerated' pkggopath="github.com/${githuborg}/${pkgname1}" -pkgrel=2 +pkgrel=1 arch=('any') url="https://${pkggopath}" license=() @@ -15,9 +15,13 @@ makedepends=(git go gcc) provides=('skywire') conflicts=('skywire-mainnet') source=("git+${url}.git#branch=${BRANCH:-master}" -"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key") +"https://raw.githubusercontent.com/0pcom/skycoin_archlinux_packages/master/key" +"skywire-scripts.tar.gz" +"skywire-systemd.tar.gz") sha256sums=('SKIP' -'41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14') +'41c0a4a42ae64479b008392053f4a947618acd6bb9c3ed2672dafdb2453caa14' +'784d9b588b95c3df5a61328e662ead4108c097b44fccb1079f781d15e055a2f4' +'4b49b82e04abe3d51073e339fc133a52926cfc8d905d5fd6b823c0762f32451b') export GOOS=linux export GOPATH=${srcdir} @@ -57,13 +61,6 @@ prepare() { cd ${srcdir}/go/src/github.com/${githuborg}/${pkgname1}/cmd git checkout master 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 } build() { @@ -76,125 +73,6 @@ build() { -asmflags "all=-trimpath=${GOPATH}" \ -ldflags "-extldflags ${LDFLAGS}" \ -v ./... - - msg 2 'creating launcher scripts for skywire' - mkdir -p ${srcdir}/go/${pkgname1}-scripts - cd ${srcdir}/go/${pkgname1}-scripts - - echo -e '#!/bin/bash -#launch skywire manager with nohup using new discovery server: discovery.skycoin.com -skywire-manager-nohup -skywire-node-nohup -echo "skywire has started"' > ${pkgname1} - chmod +x ${pkgname1} - - echo -e '#!/bin/bash -#launch skywire manager with nohup -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-manager -web-dir /usr/lib/skycoin/skywire/static/skywire-manager/ > /dev/null 2>&1 &sleep 3 -echo "skywire-manager has started"' > ${pkgname1}-manager-nohup - chmod +x ${pkgname1}-manager-nohup - - echo -e '#!/bin/bash -#launch skywire node with nohup & discovery server: discovery.skycoin.com -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-node -connect-manager -manager-address 127.0.0.1:5998 -manager-web 127.0.0.1:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 -echo "skywire-node has started"' > ${pkgname1}-node-nohup - chmod +x ${pkgname1}-node-nohup - #edit the following script for the IP of your manager; default is the official setup with manager at 192.168.0.2 - echo -e '#!/bin/bash -#launch skywire official node with nohup & discovery server: discovery.skycoin.com -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-node -connect-manager -manager-address 192.168.0.2:5998 -manager-web 192.168.0.2:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 -echo "skywire-node has started"' > ${pkgname1}-node-miner - chmod +x ${pkgname1}-node-miner - - echo -e '#!/bin/bash -#launch skywire qubes node with nohup & discovery server: discovery.skycoin.com -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-node -connect-manager -manager-address 10.137.0.16:5998 -manager-web 10.137.0.16:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 -echo "skywire-node has started"' > ${pkgname1}-node-qubes - chmod +x ${pkgname1}-node-qubes - - #script to set a custom manager IP address at runtime - echo -e '#!/bin/bash -#launch skywire official node with nohup and a custom IP -read -p "Skywire Manager IP:" SKYMGRIP -echo "Skywire manager set to $SKYMGRIP" -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 -echo "skywire-node has started"' > ${pkgname1}-node-setip - chmod +x ${pkgname1}-node-setip -#script to set a custom manager IP address at boot to be used with the system.d service. - echo -e '#!/bin/bash -#launch skywire official node with nohup and a custom IP -export GOBIN=/usr/lib/skycoin/go/bin -export GOPATH=/usr/lib/skycoin/go -nohup skywire-node -connect-manager -manager-address $SKYMGRIP:5998 -manager-web $SKYMGRIP:8000 -discovery-address testnet.skywire.skycoin.com:5999-028ec969bdeb92a1991bb19c948645ac8150468a6919113061899051409de3f243 -address :5000 -web-port :6001 > /dev/null 2>&1 &cd / > /dev/null 2>&1 &sleep 3 -echo "skywire-node has started"' > ${pkgname1}-node-envip - chmod +x ${pkgname1}-node-envip - - echo -e '#!/bin/bash -#halt skywire -sudo killall skywire-node -sudo killall skywire-manager -echo "skywire halted"' > ${pkgname1}-halt - chmod +x ${pkgname1}-halt - - msg 2 'creating system.d .service files' - #these service files point to skywire & skywire-node-miner scripts from above - #the systemd service files included with skywire are wrong for archlinux (debian formatted) - cd ${srcdir}/go - echo -e '[Unit] -Description=Skywire Manager Node service -After=network.target -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/skywire -RemainAfterExit=yes -ExecStop=/usr/bin/skywire-halt -TryExec=/usr/bin/skywire - -[Install] -WantedBy=multi-user.target ' > ${pkgname1}-manager.service - - echo -e '[Unit] -Description=Skywire Node service -After=network.target -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/skywire-node-miner -RemainAfterExit=yes -ExecStop=/usr/bin/skywire-halt -TryExec=/usr/bin/skywire - -[Install] -WantedBy=multi-user.target ' > ${pkgname1}-node.service -#use the following system.d service for a custom manager IP address;$ echo SKYMGRIP=<IP of skywire manager> >> .bashrc -#this service file points to skywire-node-env - echo -e '[Unit] -Description=Skywire Node service -After=network.target -After=network-online.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/skywire-node-envip -RemainAfterExit=yes -ExecStop=/usr/bin/skywire-halt -TryExec=/usr/bin/skywire - -[Install] -WantedBy=multi-user.target ' > ${pkgname1}-node-envip.service } package() { @@ -209,30 +87,28 @@ package() { #install binaries & symlink to /usr/bin msg2 'installing binaries' skybins=${srcdir}/go/bin - skybins1=${pkgdir}/usr/lib/${projectname}/go/bin/ #collect the binaries & install - skywirebins=$( ls "$skybins") + skywirebins=$(ls $srcdir/go/bin/) 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/${pkgname1}-${i} - chmod 755 ${pkgdir}/usr/bin/${pkgname1}-${i} + chmod 755 ${pkgdir}/usr/lib/${projectname}/go/bin/${i} done mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-manager ${pkgdir}/usr/bin/${pkgname1}-manager - chmod 755 ${pkgdir}/usr/bin/${pkgname1}-manager mv ${pkgdir}/usr/bin/${pkgname1}-${pkgname1}-node ${pkgdir}/usr/bin/${pkgname1}-node - chmod 755 ${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}/go/${pkgname1}-scripts ) + skywirescripts=$(ls $srcdir/$pkgname1-scripts/) for i in ${skywirescripts}; do - cp ${srcdir}/go/${pkgname1}-scripts/${i} ${pkgdir}/usr/bin/${i} + install -Dm755 ${srcdir}/${pkgname1}-scripts/${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/lib/${projectname}/go/bin/${i} done - #install the system.d service - install -Dm644 ${srcdir}/go/${pkgname1}-manager.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-manager.service - install -Dm644 ${srcdir}/go/${pkgname1}-node.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node.service - install -Dm644 ${srcdir}/go/${pkgname1}-node-envip.service ${pkgdir}/usr/lib/systemd/system/${pkgname1}-node-envip.service + #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 } diff --git a/PKGBUILD.sig b/PKGBUILD.sig Binary files differindex d0b5b8ac4927..8e8ce35de13d 100644 --- a/PKGBUILD.sig +++ b/PKGBUILD.sig diff --git a/skywire-scripts.tar.gz b/skywire-scripts.tar.gz Binary files differnew file mode 100644 index 000000000000..3c7f2ee99ed4 --- /dev/null +++ b/skywire-scripts.tar.gz diff --git a/skywire-systemd.tar.gz b/skywire-systemd.tar.gz Binary files differnew file mode 100644 index 000000000000..5e34c11a49aa --- /dev/null +++ b/skywire-systemd.tar.gz |