Try fixing installing 32-bit go, and try fixing 32-bit paths in scripts

1 files changed, 13 insertions, 1 deletions

diff --git a/desktop/scripts/build-meek-client.py b/desktop/scripts/build-meek-client.py
index 3d81d62f..a33e314b 100755
--- a/desktop/scripts/build-meek-client.py
+++ b/desktop/scripts/build-meek-client.py
@@ -26,13 +26,25 @@ and hard-code the sha256 hash.
 """
 import shutil
 import os
+import sys
 import subprocess
 import inspect
 import platform
 
 
 def main():
-    if shutil.which("go") is None:
+    # Figure out the architecture and python path
+    if "64 bit" in sys.version:
+        python_arch = "win-amd64"
+    else:
+        python_arch = "win32"
+
+    if os.getlogin() == "circleci" and python_arch == "win32":
+        go_path = "C:\\Program Files (x86)\\Go\\bin\\go"
+    else:
+        go_path = shutil.which("go")
+
+    if go_path is None:
         print("Install go: https://golang.org/doc/install")
         return