From f5c1611f9cdf027f75c81576d17dfee8671d65ca Mon Sep 17 00:00:00 2001 From: yum Date: Tue, 28 Mar 2023 17:47:29 -0700 Subject: package.ps1 always regenerates Python/ Intended to avoid accidentally releasing dirty environments. --- GUI/package.ps1 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'GUI') diff --git a/GUI/package.ps1 b/GUI/package.ps1 index 7e0eace..1b7fa6d 100644 --- a/GUI/package.ps1 +++ b/GUI/package.ps1 @@ -16,6 +16,7 @@ if (Test-Path $install_dir) { $py_dir = "Python" +rm -Recurse $py_dir if (-Not (Test-Path $py_dir)) { echo "Fetching python" @@ -32,12 +33,6 @@ if (-Not (Test-Path $py_dir)) { echo "../Scripts" >> Python/python310._pth echo "import site" >> Python/python310._pth - - ./Python/python.exe Python/get-pip.py - - echo "Installing future" - echo "Assuming host has python 3.10.9 installed" # TODO test for this - python -m pip install future==0.18.2 --target Python/Lib/site-packages } $pip_path = "$py_dir/get-pip.py" @@ -55,6 +50,14 @@ if (-Not (Test-Path $pip_path)) { mv $PIP_FILE $pip_path } +if ($true) { + ./Python/python.exe Python/get-pip.py + + echo "Installing future" + echo "Assuming host has python 3.10.9 installed" # TODO test for this + python -m pip install future==0.18.2 --target Python/Lib/site-packages +} + $git_dir = "PortableGit" if (-Not (Test-Path $git_dir)) { -- cgit v1.2.3