From cf9c6a69e5c182f48939befea089fb3c1b641e2d Mon Sep 17 00:00:00 2001
From: Oliver Blanthorn <freedom4cows@gmail.com>
Date: Mon, 23 Sep 2019 07:40:05 +0100
Subject: [PATCH] Disable installing native messenger for 'signed' builds

---
 scripts/build.sh | 18 ++++++++++--------
 scripts/sign     | 10 +++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index d62b7bab..a61df1bd 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -52,14 +52,16 @@ scripts/newtab.md.sh
 scripts/make_tutorial.sh
 scripts/make_docs.sh
 
-if [ "$(isWindowsMinGW)" = "True" ]; then
-  powershell \
-    -NoProfile \
-    -InputFormat None \
-    -ExecutionPolicy Bypass \
-    native/win_install.ps1 -DebugDirBase native
-else
-  native/install.sh local
+if [ "$1" != "--no-native" ]; then
+    if [ "$(isWindowsMinGW)" = "True" ]; then
+      powershell \
+        -NoProfile \
+        -InputFormat None \
+        -ExecutionPolicy Bypass \
+        native/win_install.ps1 -DebugDirBase native
+    else
+      native/install.sh local
+    fi
 fi
 
 (webpack --display errors-only --bail\
diff --git a/scripts/sign b/scripts/sign
index a53f42a1..194c3187 100755
--- a/scripts/sign
+++ b/scripts/sign
@@ -9,7 +9,7 @@ sign_and_submit() {
 
 publish_beta_nonewtab() {
     yarn run clean
-    yarn run build
+    yarn run build --no-native
     scripts/version.js beta
     sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim.betas.nonewtab@cmcaine/' -i build/manifest.json
     sed '/\s*"newtab":.*/d' -i build/manifest.json
@@ -19,7 +19,7 @@ publish_beta_nonewtab() {
 
 publish_beta() {
     yarn run clean
-    yarn run build
+    yarn run build --no-native
     scripts/version.js beta
     sed 's/"name": "Tridactyl"/"name": "Tridactyl: Beta"/' -i build/manifest.json
     sign_and_submit
@@ -27,7 +27,7 @@ publish_beta() {
 
 build_no_sign_beta(){
     yarn run clean
-    yarn run build
+    yarn run build --no-native
     scripts/version.js beta
     sed 's/"name": "Tridactyl"/"name": "Tridactyl: Beta"/' -i build/manifest.json
     mkdir -p web-ext-artifacts
@@ -39,7 +39,7 @@ build_no_sign_beta(){
 
 build_no_sign_stable(){
     yarn run clean
-    yarn run build
+    yarn run build --no-native
     sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim@cmcaine/' -i build/manifest.json
     mkdir -p web-ext-artifacts
     $(yarn bin)/web-ext build --source-dir ./build --overwrite-dest
@@ -50,7 +50,7 @@ build_no_sign_stable(){
 
 publish_stable() {
     yarn run clean
-    yarn run build
+    yarn run build --no-native
     sed 's/tridactyl.vim.betas@cmcaine/tridactyl.vim@cmcaine/' -i build/manifest.json
     sign_and_submit
     tar --exclude-from=.gitignore -czf ../../public_html/betas/tridactyl_source.tar.gz .