From 02b26f3c28f972f3847ace2401da7b0dfd1c3d75 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Tue, 27 Apr 2021 12:51:15 -0500
Subject: [PATCH] build: launch nim_status_client directly in packaged builds
 for macOS

Remove the `nim_status_client.sh` launcher script and make related changes.
---
 Info.runner.plist         | 28 ----------------------------
 Makefile                  |  3 ---
 nim_status_client.sh      |  4 ----
 src/nim_status_client.nim |  3 +++
 4 files changed, 3 insertions(+), 35 deletions(-)
 delete mode 100644 Info.runner.plist
 delete mode 100644 nim_status_client.sh

diff --git a/Info.runner.plist b/Info.runner.plist
deleted file mode 100644
index a410f99884..0000000000
--- a/Info.runner.plist
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>CFBundleDisplayName</key>
-        <string>Status Desktop</string>
-        <key>CFBundleExecutable</key>
-        <string>nim_status_client.sh</string>
-        <key>CFBundleIconFile</key>
-        <string>status.icns</string>
-        <key>CFBundleIdentifier</key>
-        <string>im.Status.NimStatusClient</string>
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-        <key>CFBundleName</key>
-        <string>Status</string>
-        <key>CFBundlePackageType</key>
-        <string>APPL</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0.0</string>
-        <key>IFMajorVersion</key>
-        <integer>1</integer>
-        <key>IFMinorVersion</key>
-        <integer>0</integer>
-        <key>NSHighResolutionCapable</key>
-        <string>True</string>
-    </dict>
-</plist>
diff --git a/Makefile b/Makefile
index 7551fd0f0b..f892ccab67 100644
--- a/Makefile
+++ b/Makefile
@@ -301,8 +301,6 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL)
 	mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/Resources
 	cp Info.plist $(MACOS_OUTER_BUNDLE)/Contents/
 	cp bin/nim_status_client $(MACOS_OUTER_BUNDLE)/Contents/MacOS/
-	cp nim_status_client.sh $(MACOS_OUTER_BUNDLE)/Contents/MacOS/
-	chmod +x $(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client.sh
 	cp status.icns $(MACOS_OUTER_BUNDLE)/Contents/Resources/
 	cp status.svg $(MACOS_OUTER_BUNDLE)/Contents/
 	cp -R resources.rcc $(MACOS_OUTER_BUNDLE)/Contents/
@@ -315,7 +313,6 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL)
 		$(MACOS_OUTER_BUNDLE) \
 		-executable=$(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client \
 		-qmldir=ui
-	cp Info.runner.plist $(MACOS_OUTER_BUNDLE)/Contents/Info.plist
 	macdeployqt \
 		$(MACOS_INNER_BUNDLE) \
 		-executable=$(MACOS_INNER_BUNDLE)/Contents/MacOS/QtWebEngineProcess
diff --git a/nim_status_client.sh b/nim_status_client.sh
deleted file mode 100644
index 1210036ef4..0000000000
--- a/nim_status_client.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd "${0%/*}"
-./nim_status_client
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index 8298f3ce9d..0608293566 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -25,6 +25,9 @@ logScope:
   topics = "main"
 
 proc mainProc() =
+  if defined(macosx) and defined(production):
+    setCurrentDir(getAppDir())
+
   let fleets =
     if defined(windows) and defined(production):
       "/../resources/fleets.json"