From d2066e44cb23e8588b16403f99bb304981ed6cde Mon Sep 17 00:00:00 2001
From: Profitroll <47523801+profitrollgame@users.noreply.github.com>
Date: Sat, 28 Jan 2023 10:03:19 +0100
Subject: [PATCH] Renamed and reconfigured build tasks

---
 .vscode/tasks/linux/build.sh                 | 14 +++++++++++---
 .vscode/tasks/linux/cleanup_everything.sh    |  4 ++--
 .vscode/tasks/linux/test.sh                  |  6 +++---
 .vscode/tasks/windows/build.bat              |  4 ++--
 .vscode/tasks/windows/cleanup_everything.bat |  4 ++--
 .vscode/tasks/windows/test.bat               |  4 ++--
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.vscode/tasks/linux/build.sh b/.vscode/tasks/linux/build.sh
index f75c3ee..a3ba89c 100644
--- a/.vscode/tasks/linux/build.sh
+++ b/.vscode/tasks/linux/build.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 
-rm -rf dist/linux/app
+rm -rf dist/linux/StardewSync
 
-source buildenv/bin/activate
-pyinstaller app.spec --noconfirm
\ No newline at end of file
+source buildenv/bin/activate && pyi-makespec main.py \
+    -n "StardewSync" \
+    -p "buildenv" \
+    -i "assets/favicon.ico" \
+    --add-data "config.json:."
+    --add-data "assets:assets" \
+    --add-data "buildenv/Lib/site-packages/sv_ttk/sv.tcl:sv_ttk/" \
+    --add-data "buildenv/Lib/site-packages/sv_ttk/theme/*:sv_ttk/theme/" \
+    --noconsole \
+&& pyinstaller "StardewSync.spec" --noconfirm
\ No newline at end of file
diff --git a/.vscode/tasks/linux/cleanup_everything.sh b/.vscode/tasks/linux/cleanup_everything.sh
index 0a20723..7784155 100644
--- a/.vscode/tasks/linux/cleanup_everything.sh
+++ b/.vscode/tasks/linux/cleanup_everything.sh
@@ -6,8 +6,8 @@ python3 -Bc "import pathlib; [p.rmdir() for p in pathlib.Path('.').rglob('__pyca
 rm -rf build/linux/*
 rm -rf build/windows/*
 
-rm -rf dist/linux/app
-rm -rf dist/windows/app
+rm -rf "dist/linux/StardewSync"
+rm -rf "dist/windows/StardewSync"
 
 rm -rf venv
 rm -rf buildenv
\ No newline at end of file
diff --git a/.vscode/tasks/linux/test.sh b/.vscode/tasks/linux/test.sh
index 261d39a..ebc2346 100644
--- a/.vscode/tasks/linux/test.sh
+++ b/.vscode/tasks/linux/test.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-cd dist/linux/app
+cd "dist/linux/StardewSync"
 
-chmod +x StardewSync
+chmod +x "StardewSync"
 
-./StardewSync
\ No newline at end of file
+"./StardewSync"
\ No newline at end of file
diff --git a/.vscode/tasks/windows/build.bat b/.vscode/tasks/windows/build.bat
index 84ddf8f..bc6ac47 100644
--- a/.vscode/tasks/windows/build.bat
+++ b/.vscode/tasks/windows/build.bat
@@ -1,3 +1,3 @@
-rmdir /S /Q dist\windows\app
+rmdir /S /Q "dist\windows\StardewSync"
 
-.\buildenv\scripts\activate && pyinstaller dist\windows\app.spec --noconfirm --distpath=dist\windows --workpath=build\windows
\ No newline at end of file
+.\buildenv\scripts\activate && pyi-makespec main.py -n "StardewSync" -p "buildenv" -i "assets/favicon.ico" --add-data "config.json;." --add-data "assets;assets" --add-data "buildenv/Lib/site-packages/sv_ttk/sv.tcl;sv_ttk/" --add-data "buildenv/Lib/site-packages/sv_ttk/theme/*;sv_ttk/theme/" --noconsole && pyinstaller ".\StardewSync.spec" --noconfirm --distpath=dist\windows --workpath=build\windows
\ No newline at end of file
diff --git a/.vscode/tasks/windows/cleanup_everything.bat b/.vscode/tasks/windows/cleanup_everything.bat
index 9fa00c1..e837748 100644
--- a/.vscode/tasks/windows/cleanup_everything.bat
+++ b/.vscode/tasks/windows/cleanup_everything.bat
@@ -4,8 +4,8 @@ python -Bc "import pathlib; [p.rmdir() for p in pathlib.Path('.').rglob('__pycac
 rmdir /S /Q build\linux\*
 rmdir /S /Q build\windows\*
 
-rmdir /S /Q dist\linux\app
-rmdir /S /Q dist\windows\app
+rmdir /S /Q "dist\linux\StardewSync"
+rmdir /S /Q "dist\windows\StardewSync"
 
 rmdir /S /Q venv
 rmdir /S /Q buildenv
\ No newline at end of file
diff --git a/.vscode/tasks/windows/test.bat b/.vscode/tasks/windows/test.bat
index 3c6aaae..acfee92 100644
--- a/.vscode/tasks/windows/test.bat
+++ b/.vscode/tasks/windows/test.bat
@@ -1,2 +1,2 @@
-cd dist\windows\app
-.\StardewSync.exe
\ No newline at end of file
+cd "dist\windows\StardewSync"
+".\StardewSync.exe"
\ No newline at end of file