From 1f2686ab0d10ad748ae93a348f144d9e945ca1f5 Mon Sep 17 00:00:00 2001
From: Johnny <nor0x@users.noreply.github.com>
Date: Wed, 18 Oct 2023 21:30:01 +0200
Subject: [PATCH] cleanup and path madness

---
 .github/workflows/release.yml | 5 -----
 scripts/build-macos.sh        | 4 ++++
 scripts/build-windows.sh      | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c5b7ab9..db1b77b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,11 +35,6 @@ jobs:
         PP_PATH=$RUNNER_TEMP/build_pp.provisionprofile
         KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
 
-        #log variables
-        echo "CERTIFICATE_PATH=$CERTIFICATE_PATH"
-        echo "PP_PATH=$PP_PATH"
-        echo "KEYCHAIN_PATH=$KEYCHAIN_PATH"
-
         # import certificate and provisioning profile from secrets
         echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
         echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
diff --git a/scripts/build-macos.sh b/scripts/build-macos.sh
index c3456a7..c1688dd 100644
--- a/scripts/build-macos.sh
+++ b/scripts/build-macos.sh
@@ -1,5 +1,7 @@
 cd ..
+version=$(cat version.txt)
 cd /Users/runner/work/Dots/Dots/src/
+
 dotnet restore
 echo "Building Dots for macOS arm64"
 dotnet msbuild -t:BundleApp -property:Configuration=Release -p:UseAppHost=true -p:RuntimeIdentifier=osx-arm64
@@ -23,8 +25,10 @@ cp bin/Release/net8.0-macos/osx-x64/Dots.app/Contents/PkgInfo bin/Release/net8.0
 
 echo "dittoing Dots for macOS x64"
 cd /Users/runner/work/Dots/Dots/src/bin/Release/net8.0-macos/osx-x64/publish
+macosx64file=$(echo Dots-$version-macos-x64.zip)
 ditto -c -k --sequesterRsrc --keepParent Dots.app $macosx64file
 
 echo "dittoing Dots for macOS arm64"
 cd /Users/runner/work/Dots/Dots/src/bin/Release/net8.0-macos/osx-arm64/publish
+macosarm64file=$(echo Dots-$version-macos-arm64.zip)
 ditto -c -k --sequesterRsrc --keepParent Dots.app $macosarm64file
\ No newline at end of file
diff --git a/scripts/build-windows.sh b/scripts/build-windows.sh
index 951edc4..f63d5c6 100644
--- a/scripts/build-windows.sh
+++ b/scripts/build-windows.sh
@@ -9,7 +9,7 @@ echo "Building Dots for Windows x64"
 dotnet publish "Dots.csproj" -c Release -f net8.0 -r win-x64
 
 echo "zip Dots for Windows x64"
-cd bin/Release/net8.0/win-x64/publish
+cd D:/a/Dots/Dots/bin/Release/net8.0/win-x64/publish
 7z a -tzip Dots-$version-win-x64.zip Dots.exe
 windowsx64file=$(echo Dots-$version-win-x64.zip)
 export windowsx64file
@@ -18,7 +18,7 @@ echo "Building Dots for Windows x86"
 dotnet publish "Dots.csproj" -c Release -f net8.0 -r win-x86
 
 echo "zip Dots for Windows x86"
-cd ../win-x86/publish
+cd D:/a/Dots/Dots/bin/Release/net8.0/win-x86/publish
 7z a -tzip Dots-$version-win-x86.zip Dots.exe
 windowsx86file=$(echo Dots-$version-win-x86.zip)
 export windowsx86file
@@ -26,6 +26,6 @@ export windowsx86file
 dotnet publish "Dots.csproj" -c Release -f net8.0 -r win-arm64
 
 echo "zip Dots for Windows arm64"
-cd ../win-arm64/publish
+cd D:/a/Dots/Dots/bin/Release/net8.0/win-arm64/publish
 7z a -tzip Dots-$version-win-arm64.zip Dots.exe
 export windowsarm64file
\ No newline at end of file