3.1.1

3 files changed, 41 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25204c60dcc1..ae36fb16de7e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ooniprobe-desktop
 	pkgdesc = The next generation OONI Probe desktop app
-	pkgver = 3.0.4
+	pkgver = 3.1.1
 	pkgrel = 1
 	url = https://ooni.org
 	arch = x86_64
@@ -12,9 +12,14 @@ pkgbase = ooniprobe-desktop
 	depends = xdg-utils
 	conflicts = ooniprobe
 	replaces = ooniprobe
-	source = ooniprobe-desktop-3.0.4.tar.gz::https://github.com/ooni/probe-desktop/archive/v3.0.4.tar.gz
+	noextract = ooniprobe_v3.0.11_linux_amd64.tar.gz
+	source = ooniprobe-desktop-3.1.1.tar.gz::https://github.com/ooni/probe-desktop/archive/v3.1.1.tar.gz
+	source = https://github.com/ooni/probe-cli/releases/download/v3.0.11/ooniprobe_v3.0.11_linux_amd64.tar.gz
+	source = ooniprobe_checksums_3.0.11.txt::https://github.com/ooni/probe-cli/releases/download/v3.0.11/ooniprobe_checksums.txt
 	source = ooniprobe-desktop.desktop
-	sha256sums = 00e223620edc5c8aee003df705f640752de7dd8d0403231708c9cda35f84d4dd
+	sha256sums = ed6311f708521e8610f33c17f938d2f2a193eb14ef6385bb7e48ab93fe02ff5c
+	sha256sums = 0b7bd2338ae861fc48e3310c3d4203a51a9252b67704289a9de6f93e0084f281
+	sha256sums = 8d8bdec6bb92c29735c185e7a732d949c645d6877b2ed5bdbdee45b4d171941d
 	sha256sums = baaf4f3cca079dddc0b4e048c8778c6cc84786bb88fd9d218424b7b9f04f1135
 
 pkgname = ooniprobe-desktop
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..33cbde1406dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
+!ooniprobe-desktop.desktop
diff --git a/PKGBUILD b/PKGBUILD
index a566300934d4..c5e2ae02c703 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=ooniprobe-desktop
-pkgver=3.0.4
+pkgver=3.1.1
+_cliver=3.0.11
 pkgrel=1
 pkgdesc="The next generation OONI Probe desktop app"
 arch=('x86_64')
@@ -11,8 +12,13 @@ makedepends=('yarn')
 conflicts=("${pkgname%-desktop}")
 replaces=("${pkgname%-desktop}")
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ooni/probe-desktop/archive/v$pkgver.tar.gz"
+        "https://github.com/ooni/probe-cli/releases/download/v$_cliver/ooniprobe_v${_cliver}_linux_amd64.tar.gz"
+        "ooniprobe_checksums_${_cliver}.txt::https://github.com/ooni/probe-cli/releases/download/v$_cliver/ooniprobe_checksums.txt"
         "$pkgname.desktop")
-sha256sums=('00e223620edc5c8aee003df705f640752de7dd8d0403231708c9cda35f84d4dd'
+noextract=("ooniprobe_v${_cliver}_linux_amd64.tar.gz")
+sha256sums=('ed6311f708521e8610f33c17f938d2f2a193eb14ef6385bb7e48ab93fe02ff5c'
+            '0b7bd2338ae861fc48e3310c3d4203a51a9252b67704289a9de6f93e0084f281'
+            '8d8bdec6bb92c29735c185e7a732d949c645d6877b2ed5bdbdee45b4d171941d'
             'baaf4f3cca079dddc0b4e048c8778c6cc84786bb88fd9d218424b7b9f04f1135')
 
 prepare() {
@@ -20,14 +26,29 @@ prepare() {
 
 	# Disable building of rpm & tar.gz
 	sed -i 's/"deb",/"deb"/g' package.json
-	sed -i '43,44d' package.json
+	sed -i '49,50d' package.json
+
+	# Disable downloading probe-cli & remove other platforms
+	sed -i 's/darwin|linux|windows/linux/g' scripts/download-bin.js
+	sed -i '/execSync(`curl/d' scripts/download-bin.js
+
+	# Place files for verification
+	mkdir -p build/probe-cli/linux_amd64
+	cp "$srcdir/ooniprobe_v${_cliver}_linux_amd64.tar.gz" build/probe-cli
+	cp "$srcdir/ooniprobe_checksums_${_cliver}.txt" \
+		build/probe-cli/ooniprobe_checksums.txt
+
+	# Remove checksums for other platforms
+	sed -i '1d' build/probe-cli/ooniprobe_checksums.txt
+	sed -i '2,3d' build/probe-cli/ooniprobe_checksums.txt
 }
 
 build() {
 	cd "${pkgname#ooni}-$pkgver"
 	yarn install --cache-folder "$srcdir/yarn-cache"
 	yarn run probe-cli
-	yarn run pack:linux
+#	yarn run pack:linux
+	yarn run build && node_modules/.bin/electron-builder --linux
 }
 
 package() {