3 files changed, 19 insertions, 15 deletions
diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives
index bbc61996..d1a30014 100755
--- a/bin/build-distribution-archives
+++ b/bin/build-distribution-archives
@@ -1,14 +1,16 @@
+#!/bin/bash
+
 # TRAVIS_BRANCH is the branch name or the name of the tag.
-VERSION="$(echo ${TRAVIS_BRANCH} | tr / -)"
-OS="${TRAVIS_OS_NAME}"
+VERSION="$(echo ${TRAVIS_BRANCH:-${GITHUB_REF}} | tr / -)"
+OS="${TRAVIS_OS_NAME:-$(uname)}"
 ARCH="$(uname -m)"
 
 MACVERSION="${TRAVIS_OSX_IMAGE}"
-if [ ${MACVERSION} = "xcode9.2" ]; then
+if [ "${MACVERSION}" = "xcode9.2" ]; then
     MACVERSION="sierra"
-elif [ ${MACVERSION} = "xcode9.4" ]; then
+elif [ "${MACVERSION}" = "xcode9.4" ]; then
     MACVERSION="high_sierra"
-elif [ ${MACVERSION} = "xcode10.2" ]; then
+elif [ "${MACVERSION}" = "xcode10.2" ]; then
     MACVERSION="mojave"
 fi
 
@@ -21,6 +23,8 @@ else
     cp -a electron/dist/*-unpacked dist/inkstitch/electron
 fi
 
+mkdir artifacts
+
 for d in inx/*; do
 	lang=${d%.*}
 	lang=${lang#*/}	
@@ -28,11 +32,12 @@ for d in inx/*; do
 
     cd dist
 	if [ "$BUILD" = "windows" ]; then
-		zip -r ../inkstitch-${VERSION}-win32-${lang}.zip *
+        echo
+		python -m zipfile -c ../artifacts/inkstitch-${VERSION}-win32-${lang}.zip *
 	elif [ "$BUILD" = "osx" ]; then
-		tar zcf ../inkstitch-${VERSION}-${OS}-${MACVERSION}-${ARCH}-$lang.tar.gz *
+		tar zcf ../artifacts/inkstitch-${VERSION}-${OS}-${MACVERSION}-${ARCH}-$lang.tar.gz *
 	else
-		tar zcf ../inkstitch-${VERSION}-${OS}-${ARCH}-$lang.tar.gz *
+		tar zcf ../artifacts/inkstitch-${VERSION}-${OS}-${ARCH}-$lang.tar.gz *
 	fi
 	cd ..
 done
diff --git a/bin/build-electron b/bin/build-electron
index d8ce78b8..1b90b556 100755
--- a/bin/build-electron
+++ b/bin/build-electron
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-if [ "$BUILD" = "windows" -o "$BUILD" = "linux" ]; then
-  if [ "$BUILD" = "windows" ]; then
-    args="-w --ia32"
-  else
-    args="-l --x64"
-  fi
+if [ "$BUILD" = "windows" ]; then
+  cd electron
+  yarn --link-duplicates --pure-lockfile && yarn run dist -w --ia32
+elif [ "$BUILD" = "linux" ]; then
+  args="-l --x64"
 
   docker run --rm \
     -e ELECTRON_CACHE=$HOME/.cache/electron \
diff --git a/bin/build-python b/bin/build-python
index c740c782..7326e371 100755
--- a/bin/build-python
+++ b/bin/build-python
@@ -35,7 +35,7 @@ pyinstaller_args+="-p inkscape/share/extensions "
 pyinstaller_args+="--log-level DEBUG "
 
 if [ "$BUILD" = "windows" ]; then
-    wine c:\\Python\\scripts\\pyinstaller.exe $pyinstaller_args inkstitch.py
+    pyinstaller $pyinstaller_args inkstitch.py
 else
     # without the LD_LIBRARY_PATH, it seems that pyinstaller can't find all of
     # wxpython's shared libraries