msmpi: Use 7zip helper functions for extracting

This commit is contained in:
Richard Kuhnt 2019-10-16 13:49:57 +02:00
parent c69ec90052
commit c1a177d30c

View File

@ -6,12 +6,12 @@
"url": "https://github.com/Microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe", "url": "https://github.com/Microsoft/Microsoft-MPI/releases/download/v10.1.1/msmpisetup.exe",
"hash": "7308fd15e437d6829fd9c6ec5d801380faa3bff6e66e1dee3e8e005106fb6a68", "hash": "7308fd15e437d6829fd9c6ec5d801380faa3bff6e66e1dee3e8e005106fb6a68",
"env_add_path": ".", "env_add_path": ".",
"pre_install": "7z x -t# \"$dir\\msmpisetup.exe\" -o\"$dir\\tmp\"", "pre_install": "Invoke-ExternalCommand -Path \"$(Get-HelperPath -Helper 7zip)\" -ArgumentList @('x', '-t#', \"`\"$dir\\msmpisetup.exe`\"\", \"-o`\"$dir\\tmp`\"\")",
"architecture": { "architecture": {
"64bit": { "64bit": {
"installer": { "installer": {
"script": [ "script": [
"7z x -r \"$dir\\tmp\\4.msi\" -o\"$dir\"", "Expand-7zipArchive \"$dir\\tmp\\4.msi\" \"$dir\"",
"Remove-Item \"$dir\\msmpires.dll\"", "Remove-Item \"$dir\\msmpires.dll\"",
"Remove-Item \"$dir\\msmpi.dll\"", "Remove-Item \"$dir\\msmpi.dll\"",
"Rename-Item \"$dir\\msmpires64.dll\" \"$dir\\msmpires.dll\"", "Rename-Item \"$dir\\msmpires64.dll\" \"$dir\\msmpires.dll\"",
@ -21,7 +21,7 @@
}, },
"32bit": { "32bit": {
"installer": { "installer": {
"script": "7z x \"$dir\\tmp\\2.msi\" -o\"$dir\"" "script": "Expand-7zipArchive \"$dir\\tmp\\2.msi\" \"$dir\""
} }
} }
}, },