From de49af49451de9e6fc90abbc9eb73d52ce773584 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <zcash@adityapk.com>
Date: Sun, 18 Nov 2018 21:43:24 -0800
Subject: [PATCH] cleanup macOS build

---
 res/appdmg.json         |  9 ++++++---
 src/rpc.h               |  3 ---
 src/scripts/mkmacdmg.sh | 21 +++++++++++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/res/appdmg.json b/res/appdmg.json
index a27cdb6..7067401 100644
--- a/res/appdmg.json
+++ b/res/appdmg.json
@@ -2,9 +2,12 @@
   "title": "zec-qt-wallet",
   "icon": "logo.icns",
   "background": "dmgbg.png",
-  "window" : { "size" : { "width" : 600, "height" : 100}},
+  "window" : { 
+    "size" : { "width" : 600, "height" : 100},
+    "position" : { "x" : 200, "y" : 200}
+  },
   "contents": [
-    { "x": 448, "y": 60, "type": "link", "path": "/Applications" },
-    { "x": 192, "y": 60, "type": "file", "path": "../zec-qt-wallet.app" }
+    { "x": 448, "y": 80, "type": "link", "path": "/Applications" },
+    { "x": 152, "y": 80, "type": "file", "path": "../zec-qt-wallet.app" }
   ]
 }
diff --git a/src/rpc.h b/src/rpc.h
index 42fa646..dcb340d 100644
--- a/src/rpc.h
+++ b/src/rpc.h
@@ -110,9 +110,6 @@ private:
 
     // Current balance in the UI. If this number updates, then refresh the UI
     QString                     currentBalance;
-
-    // First time warning flag for no connection
-    bool                        firstTime = true;
 };
 
 #endif // RPCCLIENT_H
diff --git a/src/scripts/mkmacdmg.sh b/src/scripts/mkmacdmg.sh
index 640cfab..3289526 100755
--- a/src/scripts/mkmacdmg.sh
+++ b/src/scripts/mkmacdmg.sh
@@ -16,20 +16,33 @@ if [ ! -f ../zcash/src/zcashd ]; then
 fi
 
 #Clean
+echo -n "Cleaning............"
 make distclean >/dev/null 2>&1
-rm artifacts/zec-qt-wallet-v$APP_VERSION.dmg
+rm -f artifacts/zec-qt-wallet-v$APP_VERSION.dmg
+echo "[OK]"
 
+
+echo -n "Building............"
 # Build
-$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release
+$QT_PATH/bin/qmake zec-qt-wallet.pro CONFIG+=release >/dev/null
 make -j4 >/dev/null
+echo "[OK]"
 
 #Qt deploy
+echo -n "Deploying..........."
 mkdir artifacts >/dev/null 2>&1
 rm -f artifcats/zec-qt-wallet.dmg >/dev/null 2>&1
 rm -f artifacts/rw* >/dev/null 2>&1
 cp ../zcash/src/zcashd zec-qt-wallet.app/Contents/MacOS/
 $QT_PATH/bin/macdeployqt zec-qt-wallet.app 
+echo "[OK]"
 
+
+echo -n "Building dmg........"
 # create-dmg --volname "zec-qt-wallet-v$APP_VERSION" --volicon "res/logo.icns" --window-pos 200 120 --icon "zec-qt-wallet.app" 200 190  --app-drop-link 600 185 --hide-extension "zec-qt-wallet.app"  --window-size 800 400 --hdiutil-quiet --background res/dmgbg.png  artifacts/zec-qt-wallet.dmg zec-qt-wallet.app >/dev/null
-
-appdmg res/appdmg.json artifacts/zec-qt-wallet-v$APP_VERSION.dmg
+appdmg --quiet res/appdmg.json artifacts/zec-qt-wallet-v$APP_VERSION.dmg >/dev/null
+if [ ! -f artifacts/zec-qt-wallet-v$APP_VERSION.dmg ]; then
+    echo "[ERROR]"
+    exit 1
+fi
+echo  "[OK]"