Merge pull request #415 from Laupetin/fix/redownload-premake-on-update

fix: redownload premake when version is outdated
This commit is contained in:
Jan 2025-04-21 18:58:21 +02:00 committed by GitHub
commit 1cccfe352b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions

View File

@ -28,7 +28,7 @@ IF ERRORLEVEL 1 (
) )
echo Extracting... echo Extracting...
%POWERSHELL_BIN% -NoProfile -NonInteractive -Command "Expand-Archive -LiteralPath build/premake.zip -DestinationPath build" %POWERSHELL_BIN% -NoProfile -NonInteractive -Command "Expand-Archive -LiteralPath build/premake.zip -DestinationPath build -Force"
IF ERRORLEVEL 1 ( IF ERRORLEVEL 1 (
echo Extraction failed >&2 echo Extraction failed >&2
exit 2 exit 2
@ -59,8 +59,11 @@ IF "%PREMAKE_NO_GLOBAL%" EQU "" (
) )
IF EXIST build/premake5.exe ( IF EXIST build/premake5.exe (
set PREMAKE_BIN="build/premake5.exe" build\premake5.exe --version >NUL
goto runpremake IF NOT ERRORLEVEL 1 (
set PREMAKE_BIN="build/premake5.exe"
goto runpremake
)
) )
if "%PREMAKE_NO_PROMPT%" NEQ "" ( if "%PREMAKE_NO_PROMPT%" NEQ "" (

View File

@ -62,7 +62,7 @@ expect_inside_git_repository
PREMAKE_BIN='' PREMAKE_BIN=''
if [[ -z "$PREMAKE_NO_GLOBAL" ]] && [[ -x "$(command -v premake5)" ]]; then if [[ -z "$PREMAKE_NO_GLOBAL" ]] && [[ -x "$(command -v premake5)" ]]; then
PREMAKE_BIN='premake5' PREMAKE_BIN='premake5'
elif [[ -x "$(command -v build/premake5)" ]]; then elif [[ -x "$(command -v build/premake5)" ]] && [[ ! -z "$(build/premake5 --version)" ]]; then
PREMAKE_BIN='build/premake5' PREMAKE_BIN='build/premake5'
else else
echo "Could not find premake5. You can either install it yourself or this script download it for you." echo "Could not find premake5. You can either install it yourself or this script download it for you."