From 2089589d34ca7b728b1dd5a7d9bd85a0f04471e0 Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Mon, 10 May 2021 08:53:19 -0400
Subject: [PATCH] fix distpath

---
 .github/actions/linux-install.sh   | 7 ++++---
 .github/actions/macos-install.sh   | 7 ++++---
 .github/actions/windows-install.sh | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/actions/linux-install.sh b/.github/actions/linux-install.sh
index 72d84f79..cdf84764 100755
--- a/.github/actions/linux-install.sh
+++ b/.github/actions/linux-install.sh
@@ -1,9 +1,10 @@
-export gampath="dist"
+export distpath="dist/"
+export gampath="${distpath}/gam"
 rm -rf $gampath
 mkdir -p $gampath
 export gampath=$(readlink -e $gampath)
-$python -OO -m PyInstaller --clean --noupx --strip -F --distpath $gampath gam.spec
-export gam="${gampath}/gam/gam"
+$python -OO -m PyInstaller --clean --noupx --strip -F --distpath $distpath gam.spec
+export gam="${gampath}/gam"
 export GAMVERSION=`$gam version simple`
 cp LICENSE $gampath
 cp GamCommands.txt $gampath
diff --git a/.github/actions/macos-install.sh b/.github/actions/macos-install.sh
index 5eadffd0..b67af5de 100755
--- a/.github/actions/macos-install.sh
+++ b/.github/actions/macos-install.sh
@@ -2,11 +2,12 @@ echo "MacOS Version Info According to Python:"
 python -c "import platform; print(platform.mac_ver())"
 echo "Xcode versionn:"
 xcodebuild -version
-export gampath=dist
+export distpath="dist/"
+export gampath="${distpath}/gam"
 rm -rf $gampath
 export specfile="gam.spec"
-$python -OO -m PyInstaller --clean --noupx --strip -F --distpath "${gampath}" "${specfile}"
-export gam="${gampath}/gam/gam"
+$python -OO -m PyInstaller --clean --noupx --strip -F --distpath "${distpath}" "${specfile}"
+export gam="${gampath}/gam"
 $gam version extended
 export GAMVERSION=`$gam version simple`
 cp LICENSE "${gampath}"
diff --git a/.github/actions/windows-install.sh b/.github/actions/windows-install.sh
index 49c4c1f6..1477748b 100755
--- a/.github/actions/windows-install.sh
+++ b/.github/actions/windows-install.sh
@@ -4,12 +4,13 @@ elif [[ "$PLATFORM" == "x86" ]]; then
   export WIX_BITS="x86"
 fi
 echo "compiling GAM with pyinstaller..."
-export gampath="dist"
+export distpath="dist/"
+export gampath="${distpath}/gam"
 rm -rf $gampath
 mkdir -p $gampath
 export gampath=$(readlink -e $gampath)
-pyinstaller --clean --noupx -F --distpath $gampath gam.spec
-export gam="${gampath}/gam/gam"
+pyinstaller --clean --noupx -F --distpath $distpath gam.spec
+export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version
 export GAMVERSION=$($gam version simple)