From c62433870b12f3da16fa235d2381f628efd5f3a8 Mon Sep 17 00:00:00 2001
From: Robert Honz <exislow+github@gmail.com>
Date: Wed, 20 Dec 2023 13:30:32 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Release=20GUI=20fix=20W?=
 =?UTF-8?q?indows=20poetry.=20Makefile=20APP=5FNAME=20as=20command=20arg?=
 =?UTF-8?q?=20possible.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/on-release-master.yml | 10 +++++-----
 Makefile                                | 14 +++++++-------
 pyproject.toml                          |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/on-release-master.yml b/.github/workflows/on-release-master.yml
index b3dd403..e64618e 100644
--- a/.github/workflows/on-release-master.yml
+++ b/.github/workflows/on-release-master.yml
@@ -110,7 +110,7 @@ jobs:
             CMD_BUILD: >
               brew install create-dmg &&
               source $VENV &&
-              poetry run make gui-macos &&
+              poetry run make gui-macos APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
               cd dist &&
               zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_MACOS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.dmg -x "*.DS_Store" &&
               cd ..
@@ -129,7 +129,7 @@ jobs:
             OS_ARCH: ${{needs.compute.outputs.ARCH_LINUX_X64}}
             CMD_BUILD: >
               source $VENV &&
-              poetry run make gui &&
+              poetry run make gui APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
               cd dist &&
               zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_LINUX_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}} &&
               cd ..
@@ -137,9 +137,10 @@ jobs:
             TARGET: "windows-2019"
             OS_ARCH: ${{needs.compute.outputs.ARCH_WINDOWS_X64}}
             CMD_BUILD: >
-              choco install zip make -y
+              choco install zip make -y &&
+              ls &&
               source $VENV &&
-              C:\Users\runneradmin\.local\bin\poetry run make gui &&
+              poetry run make gui APP_NAME=${{needs.compute.outputs.OUT_NAME_FILE}} &&
               cd dist &&
               zip -r ${{needs.compute.outputs.OUT_NAME_FILE}}_${{needs.compute.outputs.ARCH_WINDOWS_X64}}${{needs.compute.outputs.ASSET_EXTENSION}} ${{needs.compute.outputs.OUT_NAME_FILE}}.exe &&
               cd ..
@@ -174,7 +175,6 @@ jobs:
           name: ${{env.RELEASE_UPLOAD_URL}}
       - name: Get Release File Name & Upload URL
         id: get_release_info
-        shell: bash
         run: |
           VALUE=`cat ${{env.RELEASE_UPLOAD_URL}}/${{env.RELEASE_UPLOAD_URL}}.txt`
           echo "upload_url=$VALUE" >> $GITHUB_OUTPUT
diff --git a/Makefile b/Makefile
index fbe2e57..e413fcd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-app_name = "TIDAL-Downloader-NG"
+APP_NAME = "TIDAL-Downloader-NG"
 app_path_dist = "dist"
 path_asset = "tidal_dl_ng/ui"
 
@@ -61,7 +61,7 @@ help:
 gui: ## Build GUI app with PyInstaller
 	@poetry run pyinstaller --noconfirm \
 		--windowed --onefile \
-		--name "$(app_name)" \
+		--name "$(APP_NAME)" \
 		--noupx \
 		--icon $(path_asset)/icon.png \
 		tidal_dl_ng/gui.py
@@ -70,17 +70,17 @@ gui: ## Build GUI app with PyInstaller
 .PHONY: gui-macos
 gui-macos: gui ## Package GUI in a *.dmg file
 	@poetry run mkdir -p $(app_path_dist)/dmg
-	@poetry run mv "$(app_path_dist)/$(app_name).app" $(app_path_dist)/dmg
+	@poetry run mv "$(app_path_dist)/$(APP_NAME).app" $(app_path_dist)/dmg
 	@poetry run create-dmg \
-                --volname "$(app_name)" \
+                --volname "$(APP_NAME)" \
                 --volicon "$(path_asset)/icon.icns" \
                 --window-pos 200 120 \
                 --window-size 800 600 \
                 --icon-size 100 \
-                --icon "$(app_name).app" 175 120 \
-                --hide-extension "$(app_name).app" \
+                --icon "$(APP_NAME).app" 175 120 \
+                --hide-extension "$(APP_NAME).app" \
                 --app-drop-link 425 120 \
-                "$(app_path_dist)/$(app_name).dmg" \
+                "$(app_path_dist)/$(APP_NAME).dmg" \
                 "$(app_path_dist)/dmg/"
 
 .DEFAULT_GOAL := help
diff --git a/pyproject.toml b/pyproject.toml
index 39188e0..d6ff655 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "tidal-dl-ng"
-version = "0.4.29"
+version = "0.4.30"
 description = "TIDAL Medial Downloader Next Generation!"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
 repository = "https://github.com/exislow/tidal-dl-ng"
@@ -13,7 +13,7 @@ packages = [
 [tool.poetry]
 name = "tidal-dl-ng"
 authors = ["Robert Honz <cen.sored@gmail.com>"]
-version = "0.4.29"
+version = "0.4.30"
 description = "TIDAL Medial Downloader Next Generation!"
 repository = "https://github.com/exislow/tidal-dl-ng"
 documentation = "https://exislow.github.io/tidal-dl-ng/"