Upstream/gibMacOS
1
0
Fork 0
mirror of https://github.com/corpnewt/gibMacOS.git synced 2024-12-04 13:33:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

More py detection fixes

Browse Source
This commit is contained in:
CorpNewt 2019-06-07 11:14:30 -05:00 committed by GitHub
parent 5d1369ba32
commit 6e2df54886
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MakeInstall.bat
View File

@ -32,7 +32,6 @@ set "script_name=%~n0.py"
set "thisDir=%~dp0"
set /a tried=0
set "toask=yes"
set "python="
goto checkscript
@ -51,10 +50,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"
)
)
)
@ -204,8 +208,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