Show More
@@ -90,7 +90,13 b' function Invoke-Process($path, $argument' | |||||
90 | $p = Start-Process -FilePath $path -ArgumentList $arguments -Wait -PassThru -WindowStyle Hidden |
|
90 | $p = Start-Process -FilePath $path -ArgumentList $arguments -Wait -PassThru -WindowStyle Hidden | |
91 |
|
91 | |||
92 | if ($p.ExitCode -ne 0) { |
|
92 | if ($p.ExitCode -ne 0) { | |
93 | throw "process exited non-0: $($p.ExitCode)" |
|
93 | # If the MSI is already installed, ignore the error | |
|
94 | if ($p.ExitCode -eq 1638) { | |||
|
95 | Write-Output "program already installed; continuing..." | |||
|
96 | } | |||
|
97 | else { | |||
|
98 | throw "process exited non-0: $($p.ExitCode)" | |||
|
99 | } | |||
94 | } |
|
100 | } | |
95 | } |
|
101 | } | |
96 |
|
102 | |||
@@ -150,7 +156,7 b' function Install-Dependencies($prefix) {' | |||||
150 | Install-Python3 "Python 3.7 32-bit" ${prefix}\assets\python37-x86.exe ${prefix}\python37-x86 ${pip} |
|
156 | Install-Python3 "Python 3.7 32-bit" ${prefix}\assets\python37-x86.exe ${prefix}\python37-x86 ${pip} | |
151 | Install-Python3 "Python 3.7 64-bit" ${prefix}\assets\python37-x64.exe ${prefix}\python37-x64 ${pip} |
|
157 | Install-Python3 "Python 3.7 64-bit" ${prefix}\assets\python37-x64.exe ${prefix}\python37-x64 ${pip} | |
152 | Install-Python3 "Python 3.8 32-bit" ${prefix}\assets\python38-x86.exe ${prefix}\python38-x86 ${pip} |
|
158 | Install-Python3 "Python 3.8 32-bit" ${prefix}\assets\python38-x86.exe ${prefix}\python38-x86 ${pip} | |
153 |
|
|
159 | Install-Python3 "Python 3.8 64-bit" ${prefix}\assets\python38-x64.exe ${prefix}\python38-x64 ${pip} | |
154 | Install-Python3 "Python 3.9 32-bit" ${prefix}\assets\python39-x86.exe ${prefix}\python39-x86 ${pip} |
|
160 | Install-Python3 "Python 3.9 32-bit" ${prefix}\assets\python39-x86.exe ${prefix}\python39-x86 ${pip} | |
155 | Install-Python3 "Python 3.9 64-bit" ${prefix}\assets\python39-x64.exe ${prefix}\python39-x64 ${pip} |
|
161 | Install-Python3 "Python 3.9 64-bit" ${prefix}\assets\python39-x64.exe ${prefix}\python39-x64 ${pip} | |
156 | Install-Python3 "Python 3.10 32-bit" ${prefix}\assets\python310-x86.exe ${prefix}\python310-x86 ${pip} |
|
162 | Install-Python3 "Python 3.10 32-bit" ${prefix}\assets\python310-x86.exe ${prefix}\python310-x86 ${pip} |
General Comments 0
You need to be logged in to leave comments.
Login now