fix dmsghttp-config.json

4 files changed, 15 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 407c697a747e..4d7a445c3948 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = skywire
 	pkgdesc = Skywire Mainnet Node implementation. Skycoin.com
 	pkgver = 1.3.14
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/skycoin/skywire
 	install = skywire.install
 	arch = i686
@@ -23,11 +23,7 @@ pkgbase = skywire
 	makedepends = kernel-headers-musl
 	source = skywire-v1.3.14.tar.gz::https://github.com/skycoin/skywire/archive/refs/tags/v1.3.14.tar.gz
 	source = skywire-bin::git+https://aur.archlinux.org/skywire-bin
-	source = https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json
-	source = all_servers.json::https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers
 	sha256sums = 57437d305229a47a3698e06b16ecf3703add2a51b670c3fb9846d73dd4b1bf4e
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 
 pkgname = skywire
diff --git a/PKGBUILD b/PKGBUILD
index 5ff59bef1826..7c9d67eefff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _githuborg=${FORK:-$_projectname}
 pkgdesc="Skywire Mainnet Node implementation. Skycoin.com"
 _pkggopath=github.com/${_githuborg}/${_pkgname}
 pkgver='1.3.14'
-pkgrel='1'
+pkgrel='2'
 _rc=''
 #_rc='-pr1'
 _pkgver="${pkgver}${_rc}"
@@ -23,14 +23,13 @@ _icon=("skywirevpn.png" "skywire.png")
 _service=("skywire.service" "skywire-autoconfig.service")
 _source=("skywire-bin::git+https://aur.archlinux.org/skywire-bin")
 source=("skywire-${_tag_ver}.tar.gz::${url}/archive/refs/tags/${_tag_ver}.tar.gz"
-"${_source[@]}"
-"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json"
-"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers"
-)
+"${_source[@]}")
+#"https://raw.githubusercontent.com/skycoin/skywire/develop/dmsghttp-config.json"
+#"all_servers.json"::"https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers")
 sha256sums=('57437d305229a47a3698e06b16ecf3703add2a51b670c3fb9846d73dd4b1bf4e'
-            'SKIP'
-            'SKIP'
             'SKIP')
+#            'SKIP'
+#            'SKIP')
 _binary=("skywire-cli" "skywire-visor")
 _appbinary=("skychat" "skysocks" "skysocks-client" "vpn-client" "vpn-server")
 
@@ -86,11 +85,11 @@ sha256sum $(ls)
 #the dmsghttp-config.json must match the current dmsg servers on the production deployment
 #https://dmsgd.skywire.skycoin.com/dmsg-discovery/all_servers
 #fix the dmsghttp-config.json
-if command -v jq &> /dev/null ; then
-_msg2 'updating dmsghttp-config.json'
-cat dmsghttp-config.json | jq --argjson updated_servers "$(cat all_servers.json | grep -Ev "availableSessions|version|sequence|timestamp|signature" | tr -d '\n' | sed 's/,\s*}/}/g' | jq '.')"   '.prod.dmsg_servers = $updated_servers' | tee dmsghttp-config.json
-fi
-[[ -f "${srcdir}/all_servers.json" ]] && rm "${srcdir}/all_servers.json"
+#if command -v jq &> /dev/null ; then
+#_msg2 'updating dmsghttp-config.json'
+#cat dmsghttp-config.json | jq --argjson updated_servers "$(cat all_servers.json | grep -Ev "availableSessions|version|sequence|timestamp|signature" | tr -d '\n' | sed 's/,\s*}/}/g' | jq '.')"   '.prod.dmsg_servers = $updated_servers' | tee dmsghttp-config.json
+#fi
+#[[ -f "${srcdir}/all_servers.json" ]] && rm "${srcdir}/all_servers.json"
 }
 
 package() {
@@ -140,7 +139,7 @@ ln -rTsf "${_pkgdir}/${_bin}/${_pkgname}-visor" "${_pkgdir}/usr/bin/${_pkgname}"
 _msg2 'installing dmsghttp-config.json'
 install -Dm644 "${srcdir}/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json" || install -Dm644 "${srcdir}/skywire/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json" || install -Dm644 "${srcdir}/skywire-${_pkgver}/dmsghttp-config.json" "${_pkgdir}/${_dir}/dmsghttp-config.json"
 #make sure the dmsghttp-config will get redownloaded on subsequent builds
-[[ -f "${srcdir}/dmsghttp-config.json" ]] && rm "${srcdir}/dmsghttp-config.json"
+#[[ -f "${srcdir}/dmsghttp-config.json" ]] && rm "${srcdir}/dmsghttp-config.json"
 _msg2 'Installing systemd services'
 for _i in "${_service[@]}" ; do
   _msg3 ${_i}
diff --git a/cc.deb.PKGBUILD b/cc.deb.PKGBUILD
index e70c66eaddea..61d1ef1ba1d9 100644
--- a/cc.deb.PKGBUILD
+++ b/cc.deb.PKGBUILD
@@ -62,6 +62,4 @@ fi
 exit
 }
 sha256sums=('57437d305229a47a3698e06b16ecf3703add2a51b670c3fb9846d73dd4b1bf4e'
-            'SKIP'
-            '73f3d759c8fa3ff7237d78662bf37f0e886f19879f8c541bfed5e750a1810fc3'
-            '891562be2c32a3f8603d812b0569c6035f384196709335debf5b40dbf3726389')
+            'SKIP')
diff --git a/deb.PKGBUILD b/deb.PKGBUILD
index 4eae84076a48..81da693e7b7c 100644
--- a/deb.PKGBUILD
+++ b/deb.PKGBUILD
@@ -50,6 +50,4 @@ dpkg-deb --build -z9 ${_debpkgdir}
 mv *.deb ../../
 }
 sha256sums=('57437d305229a47a3698e06b16ecf3703add2a51b670c3fb9846d73dd4b1bf4e'
-            'SKIP'
-            '73f3d759c8fa3ff7237d78662bf37f0e886f19879f8c541bfed5e750a1810fc3'
-            '891562be2c32a3f8603d812b0569c6035f384196709335debf5b40dbf3726389')
+            'SKIP')