From b35840d53586683f55593a31ac1c8f07f7893111 Mon Sep 17 00:00:00 2001
From: adityapk00 <adityapk@gmail.com>
Date: Fri, 16 Nov 2018 19:51:00 -0800
Subject: [PATCH] unified build

---
 src/scripts/dobuild.ps1  | 13 ++++++++++---
 src/scripts/mkrelease.sh |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/scripts/dobuild.ps1 b/src/scripts/dobuild.ps1
index 39244ab..96e5a51 100644
--- a/src/scripts/dobuild.ps1
+++ b/src/scripts/dobuild.ps1
@@ -5,11 +5,18 @@ param (
     [Parameter(Mandatory=$true)][string]$server
 )
 
+Write-Host -NoNewline "Copying files....."
 ssh $server "rm -rf /tmp/zqwbuild"
 ssh $server "mkdir /tmp/zqwbuild"
 scp -r * ${server}:/tmp/zqwbuild | Out-Null
-ssh $server "dos2unix /tmp/zqwbuild/src/scripts/mkrelease.sh" | Out-Null
-ssh $server "chmod a+x /tmp/zqwbuild/src/scripts/mkrelease.sh"
-ssh $server "cd /tmp/zqwbuild && QT_STATIC=~/Qt/5.11.2/static/ ZCASH_DIR=~/github/zcash APP_VERSION=$version PREV_VERSION=$prev src/scripts/mkrelease.sh"
+ssh $server "dos2unix -q /tmp/zqwbuild/src/scripts/mkrelease.sh" | Out-Null
+Write-Host "[OK]"
+
+ssh $server "cd /tmp/zqwbuild && QT_STATIC=~/Qt/5.11.2/static/ ZCASH_DIR=~/github/zcash APP_VERSION=$version PREV_VERSION=$prev bash src/scripts/mkrelease.sh"
+if (!$?) {
+    Write-Output "Build failed"
+    exit 1;
+}
+
 New-Item artifacts -itemtype directory -Force | Out-Null
 scp ${server}:/tmp/zqwbuild/artifacts/* artifacts/ 
\ No newline at end of file
diff --git a/src/scripts/mkrelease.sh b/src/scripts/mkrelease.sh
index 82850bb..afab35d 100755
--- a/src/scripts/mkrelease.sh
+++ b/src/scripts/mkrelease.sh
@@ -119,7 +119,7 @@ echo "[Windows]"
 if [ -z $MXE_PATH ]; then 
     echo "MXE_PATH is not set. Set it to ~/github/mxe/usr/bin if you want to build Windows"
     echo "Not building Windows"
-    exit 1; 
+    exit 0; 
 fi
 
 if [ ! -f $ZCASH_DIR/artifacts/zcashd.exe ]; then
@@ -160,7 +160,7 @@ cp LICENSE release/zec-qt-wallet-v$APP_VERSION
 cd release && zip -r Windows-zec-qt-wallet-v$APP_VERSION.zip zec-qt-wallet-v$APP_VERSION/ > /dev/null
 cd ..
 mkdir artifacts >/dev/null 2>&1
-cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip ./artifacts
+cp release/Windows-zec-qt-wallet-v$APP_VERSION.zip ./artifacts/
 echo "[OK]"
 
 if [ -f artifacts/Windows-zec-qt-wallet-v$APP_VERSION.zip ] ; then