From e19105d8780987a27506e73a4fdaf3ddf02da0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= <jakub@status.im>
Date: Mon, 5 Jun 2023 13:38:37 +0200
Subject: [PATCH] Makefile: refactor nim_status_client target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jakub Sokołowski <jakub@status.im>
---
 Makefile | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 559f1c4e92..b19a132a05 100644
--- a/Makefile
+++ b/Makefile
@@ -472,19 +472,24 @@ endif
 
 $(NIM_STATUS_CLIENT): NIM_PARAMS += $(RESOURCES_LAYOUT)
 $(NIM_STATUS_CLIENT): $(NIM_SOURCES) $(DOTHERSIDE) | statusq check-qt-dir $(STATUSGO) $(STATUSKEYCARDGO) $(QRCODEGEN) $(FLEETS) rcc compile-translations deps
-	echo -e $(BUILD_MSG) "$@" && \
-		$(ENV_SCRIPT) nim c $(NIM_PARAMS) --passL:"-L$(STATUSGO_LIBDIR)" --passL:"-lstatus" --passL:"-L$(STATUSKEYCARDGO_LIBDIR)" --passL:"-lkeycard" $(NIM_EXTRA_PARAMS) --passL:"$(QRCODEGEN)" --passL:"-lm" src/nim_status_client.nim && \
-		[[ $$? = 0 ]] && \
-		(([[ $(detected_OS) = Darwin ]] && \
-		install_name_tool -change \
-			libstatus.dylib \
-			@rpath/libstatus.dylib \
-			bin/nim_status_client && \
-		install_name_tool -change \
-			libkeycard.dylib \
-			@rpath/libkeycard.dylib \
-			bin/nim_status_client) || true)
+	echo -e $(BUILD_MSG) "$@"
+	$(ENV_SCRIPT) nim c $(NIM_PARAMS) \
+		--passL:"-L$(STATUSGO_LIBDIR)" \
+		--passL:"-lstatus" \
+		--passL:"-L$(STATUSKEYCARDGO_LIBDIR)" \
+		--passL:"-lkeycard" \
+		--passL:"$(QRCODEGEN)" \
+		--passL:"-lm" \
+		$(NIM_EXTRA_PARAMS) src/nim_status_client.nim
 ifeq ($(detected_OS),Darwin)
+	install_name_tool -change \
+		libstatus.dylib \
+		@rpath/libstatus.dylib \
+		bin/nim_status_client
+	install_name_tool -change \
+		libkeycard.dylib \
+		@rpath/libkeycard.dylib \
+		bin/nim_status_client
 ifeq ("$(wildcard ./node_modules/.bin/fileicon)","")
 	echo -e "\033[92mInstalling:\033[39m fileicon"
 	npm i