diff --git a/installers/macos-pkg-setup-template.sh b/installers/macos-pkg-setup-template.sh index cada762..8206a3f 100644 --- a/installers/macos-pkg-setup-template.sh +++ b/installers/macos-pkg-setup-template.sh @@ -69,7 +69,7 @@ chmod +x ../python $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJOR_MINOR pyt echo "Upgrading pip..." ./python -m ensurepip -./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location +./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location --root-user-action=ignore echo "Install OpenSSL certificates" sh -e "${PYTHON_APPLICATION_PATH}/Install Certificates.command" diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index ba3bc9b..32fa232 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -50,7 +50,7 @@ chmod +x ../python $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJORMINOR pyth echo "Upgrading pip..." ./python -m ensurepip -./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location +./python -m pip install --ignore-installed pip --disable-pip-version-check --no-warn-script-location --root-user-action=ignore echo "Create complete file" touch $PYTHON_TOOLCACHE_VERSION_PATH/x64.complete diff --git a/installers/win-setup-template.ps1 b/installers/win-setup-template.ps1 index f2ac2cd..f0ea70d 100644 --- a/installers/win-setup-template.ps1 +++ b/installers/win-setup-template.ps1 @@ -101,7 +101,9 @@ if ($null -ne $InstalledVersions) { if (Test-Path -Path $InstalledVersion) { Write-Host "Deleting $InstalledVersion..." Remove-Item -Path $InstalledVersion -Recurse -Force - Remove-Item -Path "$($InstalledVersion.Parent.FullName)/${Architecture}.complete" -Force -Verbose + if (Test-Path -Path "$($InstalledVersion.Parent.FullName)/${Architecture}.complete") { + Remove-Item -Path "$($InstalledVersion.Parent.FullName)/${Architecture}.complete" -Force -Verbose + } } } } else { @@ -132,7 +134,7 @@ if ($MajorVersion -ne "2") { Write-Host "Install and upgrade Pip" $PythonExePath = Join-Path -Path $PythonArchPath -ChildPath "python.exe" -cmd.exe /c "$PythonExePath -m ensurepip && $PythonExePath -m pip install --upgrade pip --no-warn-script-location" +cmd.exe /c "$PythonExePath -m ensurepip && $PythonExePath -m pip install --upgrade pip --no-warn-script-location --root-user-action=ignore" Write-Host "Create complete file" New-Item -ItemType File -Path $PythonVersionPath -Name "$Architecture.complete" | Out-Null