From 5d1369ba3289388f217d25d15f59a5077adeddfb Mon Sep 17 00:00:00 2001 From: CorpNewt Date: Fri, 7 Jun 2019 11:13:49 -0500 Subject: [PATCH] More py detection fixes --- gibMacOS.bat | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/gibMacOS.bat b/gibMacOS.bat index aede867..1ff83d3 100644 --- a/gibMacOS.bat +++ b/gibMacOS.bat @@ -6,7 +6,6 @@ set "script_name=%~n0.command" set "thisDir=%~dp0" set /a tried=0 set "toask=yes" -set "python=" goto checkscript @@ -25,10 +24,15 @@ goto checkpy :checkpy REM Get python location -set "dummypath=%USERPROFILE%\AppData\Local\Microsoft\WindowsApps\python.exe" -FOR /F "tokens=* USEBACKQ" %%F IN (`where python`) DO ( - if /i not "%%F" == "!dummypath!" ( - set "python=%%F" +set "python=" +FOR /F "tokens=* USEBACKQ" %%F IN (`python -V 2^>^&1`) DO ( + set "t=%%F" + if /i "!t:~0,6!" == "python" ( + REM Might have python installed - let's check for the store message + if /i "!t:was not found=!" == "!t!" ( + REM There was no change - we found it. + set "python=%%F" + ) ) ) @@ -178,8 +182,8 @@ exit /b REM Python found cls if "%*"=="" ( - "!python!" "!thisDir!!script_name!" + python "!thisDir!!script_name!" ) else ( - "!python!" "!thisDir!!script_name!" %* + python "!thisDir!!script_name!" %* ) goto :EOF