diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | cc.deb.PKGBUILD | 2 | ||||
| -rw-r--r-- | cc.dev.PKGBUILD | 2 | ||||
| -rwxr-xr-x | skywire-autoconfig | 14 |
5 files changed, 19 insertions, 7 deletions
@@ -1,7 +1,7 @@ pkgbase = skywire-bin pkgdesc = Skywire: Building a new Internet. Skycoin.com pkgver = 1.3.3 - pkgrel = 3 + pkgrel = 4 url = https://github.com/skycoin/skywire install = skywire.install arch = i686 @@ -27,7 +27,7 @@ pkgbase = skywire-bin source = skywire.service source = skywire-autoconfig.service source = skycoin - sha256sums = c46efba8ed1146c10ab5aa85e9b2ca00aa28ee758c005195c2eae997b65c6922 + sha256sums = 28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00 sha256sums = f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65 sha256sums = 0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8 sha256sums = ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e @@ -4,7 +4,7 @@ _pkgname=${pkgname/-bin/} _githuborg=skycoin pkgdesc="Skywire: Building a new Internet. Skycoin.com" pkgver='1.3.3' -pkgrel=3 +pkgrel=4 _rc='' #_rc='-pr1' _pkgver="${pkgver}${_rc}" @@ -29,7 +29,7 @@ _source=("${_script[@]}" "${_key[@]}" ) source=("${_source[@]}") -sha256sums=('c46efba8ed1146c10ab5aa85e9b2ca00aa28ee758c005195c2eae997b65c6922' +sha256sums=('28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD index 7df358e1398c..b36a3e7c3344 100644 --- a/cc.deb.PKGBUILD +++ b/cc.deb.PKGBUILD @@ -25,7 +25,7 @@ noextract=( "${_binarchive}armhf.tar.gz" "${_release_url}-arm.tar.gz" ) -sha256sums=('c46efba8ed1146c10ab5aa85e9b2ca00aa28ee758c005195c2eae997b65c6922' +sha256sums=('28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' diff --git a/cc.dev.PKGBUILD b/cc.dev.PKGBUILD index db554a360c6e..201357df4b6e 100644 --- a/cc.dev.PKGBUILD +++ b/cc.dev.PKGBUILD @@ -14,7 +14,7 @@ source=("git+${url}.git#branch=develop" "${_source[@]}" ) sha256sums=('SKIP' - 'c46efba8ed1146c10ab5aa85e9b2ca00aa28ee758c005195c2eae997b65c6922' + '28cfaf8fb5c17e0d2952d8834d24952a1e402fccb3a575371cea37366d8d7b00' 'f0300bcde06b6818b637ccc23fa8206a40e67f63815781d265bd10d2cda93e65' '0c20dd44eca0266a3a10fab24c657295a833eba9f78c6b1cf06132b093ac3ba8' 'ec24750a99f5cda8d8a8dc94743943218e1b2088c2b2c7dc1644ee78d954fe7e' diff --git a/skywire-autoconfig b/skywire-autoconfig index 32f485ac962a..03a8b1203986 100755 --- a/skywire-autoconfig +++ b/skywire-autoconfig @@ -176,10 +176,22 @@ fi #attempt to import config if none exists - i.e. import skybian config or restore config if [[ ! -f /opt/skywire/skywire.json ]]; then if [[ -f /etc/skywire-config.json ]]; then - _warnmsg1 "Importing configuration from /etc/skywire-config.json" + _warnmsg1 "Importing configuration from /etc/skywire-config.json to /opt/skywire/skywire.json" cp -b /etc/skywire-config.json /opt/skywire/skywire.json fi fi +if [[ ! -f /opt/skywire/local/reward.txt ]]; then + if [[ -f /etc/reward.txt ]]; then + _warnmsg1 "Importing reward address from /etc/reward.txt to /opt/skywire/local/reward.txt" + cp -b /etc/reward.txt /opt/skywire/local/reward.txt + fi +fi +if [[ ! -f /opt/skywire/users.db ]]; then + if [[ -f /etc/users.db ]]; then + _warnmsg1 "Importing hypervisor UI login credentials from /etc/users.db to /opt/skywire/users.db" + cp -b /etc/users.db /opt/skywire/users.db + fi +fi #config generation _config_gen _svc=skywire |