Trying to solve pip issues.

metacall · Jan 29, 2025 · fb7672f · fb7672f
1 parent 6179e69
commit fb7672f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/build.bat b/build.bat
@@ -66,8 +66,7 @@ rem Uninstall Python if it is already installed
 python_installer.exe /uninstall || goto :error
 :skip_uninstall_python
 python_installer.exe /quiet TargetDir="%loc%\runtimes\python" PrependPath=1 CompileAll=1 || goto :error
-mkdir "%loc%\runtimes\python\Pip" || goto :error
-set "PATH=%PATH%;%loc%\runtimes\python;%loc%\runtimes\python\Pip\bin"
+set "PATH=%PATH%;%loc%\runtimes\python;%loc%\runtimes\python\Scripts"
 
 rem Install DotNet
 powershell -Command "$global:ProgressPreference = 'SilentlyContinue'; Expand-Archive" -Path "dotnet_sdk.zip" -DestinationPath "%loc%\runtimes\dotnet" || goto :error

diff --git a/metacall.bat b/metacall.bat
@@ -7,8 +7,8 @@ rem MetaCall
 set "PATH=%PATH%;%loc%;%loc%\lib"
 rem Python
 set "PYTHONHOME=%loc%\runtimes\python"
-set "PIP_TARGET=%loc%\runtimes\python\Pip"
-set "PATH=%PATH%;%loc%\runtimes\python;%loc%\runtimes\python\Scripts"
+set "PIP_TARGET=%loc%\runtimes\python\Lib\site-packages"
+set "PATH=%PATH%;%loc%\runtimes\python;%loc%\runtimes\python\Scripts;%loc%\runtimes\python\Lib\site-packages\bin"
 rem NodeJS
 set "PATH=%PATH%;%loc%\lib\runtimes\nodejs;%loc%\lib\runtimes\nodejs\lib"
 rem Ruby
@@ -17,8 +17,8 @@ rem DotNet Core
 set "PATH=%PATH%;%loc%\lib\runtimes\dotnet;%loc%\lib\runtimes\dotnet\host\fxr\5.0.12"
 
 rem Package Managers Paths
-set "pip_path=%loc%\runtimes\python\Pip\bin\pip.exe"
-set "pip3_path=%loc%\runtimes\python\Pip\bin\pip3.exe"
+set "pip_path=%loc%\runtimes\python\Scripts\pip.exe"
+set "pip3_path=%loc%\runtimes\python\Scripts\pip3.exe"
 set "npm_path=%loc%\runtimes\nodejs\npm.cmd"
 set "npx_path=%loc%\runtimes\nodejs\npx.cmd"
 set "bundle_path=%loc%\runtimes\ruby\bin\bundle.bat"

diff --git a/test.bat b/test.bat
@@ -23,9 +23,8 @@ set "LOADER_SCRIPT_PATH=%loc%\python"
 @ 
 setlocal
 set "PYTHONHOME=%~dp0metacall\runtimes\python"
-set "PIP_TARGET=%~dp0metacall\runtimes\python\Pip"
-set "PATH=%~dp0metacall\runtimes\python;%~dp0metacall\runtimes\python\Scripts"
-%~dp0metacall\runtimes\python\python.exe -m pip install --upgrade --force-reinstall pip
+set "PIP_TARGET=%~dp0metacall\runtimes\python\Lib\site-packages"
+set "PATH=%~dp0metacall\runtimes\python;%~dp0metacall\runtimes\python\Scripts;%~dp0metacall\runtimes\python\Lib\site-packages\bin"
 endlocal
 @
 echo Pip Test