From 01e36a77dd2df22e1a07d8ce57b71cb4d3ca86a5 Mon Sep 17 00:00:00 2001 From: CorpNewt Date: Fri, 7 Jun 2019 10:52:18 -0500 Subject: [PATCH] Cleaner py detection --- MakeInstall.bat | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/MakeInstall.bat b/MakeInstall.bat index 7e080e4..9ff164c 100644 --- a/MakeInstall.bat +++ b/MakeInstall.bat @@ -32,6 +32,7 @@ set "script_name=%~n0.py" set "thisDir=%~dp0" set /a tried=0 set "toask=yes" +set "python=" goto checkscript @@ -50,15 +51,10 @@ goto checkpy :checkpy REM Get python location -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" - ) +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" ) ) @@ -208,8 +204,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