From c572b6b182db3b97d360284959bb10460513e0f6 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Wed, 26 May 2021 11:59:57 -0400
Subject: [PATCH] fix win zip and MSI

---
 .github/actions/windows-install.sh | 7 +++++--
 src/gam.wxs                        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/actions/windows-install.sh b/.github/actions/windows-install.sh
index ec20552c..2af2ab8d 100755
--- a/.github/actions/windows-install.sh
+++ b/.github/actions/windows-install.sh
@@ -19,8 +19,11 @@ cp LICENSE $gampath
 cp GamCommands.txt $gampath
 cp gam-setup.bat $gampath
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
-/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE $gampath -xr!.svn
-
+cwd=$(pwd)
+cd "${distpath}"
+/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE gam -xr!.svn
+mv "${GAM_ARCHIVE}" "${cwd}"
+cd "${cwd}"
 echo "Running WIX candle $WIX_BITS..."
 /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs
 echo "Done with WIX candle..."
diff --git a/src/gam.wxs b/src/gam.wxs
index ccdecd15..cf71470d 100644
--- a/src/gam.wxs
+++ b/src/gam.wxs
@@ -41,7 +41,7 @@
     <ComponentGroup
         Id="ProductComponents"
         Directory="INSTALLFOLDER"
-	Source="dist">
+	Source="dist/gam">
       <Component Id="gam_exe" Guid="886abc07-73c5-4acc-9f71-58daf62aabc1">
         <File Name="gam.exe" KeyPath="yes" />
         <Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="yes" Part="last" Action="set" System="yes" />