diff options
| author | Christian Tellefsen <chris-git@tellefsen.net> | 2015-12-20 11:02:04 +0100 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-12-20 12:29:54 +0000 |
| commit | aa002845d931e0a17a35c93385054bddc8524b18 (patch) | |
| tree | 1d70b7115e8da3a51f9a02f82028756ad30b9d99 | |
| parent | 9bb3f6be4c18822267a64633c298e1a8f1809221 (diff) | |
Add %ProgramW6432% to the list of search paths when looking for 7-Zip.
This allows a 64bit 7-Zip installation to be located even though
win-setup.ps1 is run by a 32-bit process.
This applies to 64bit Windows (7, 10, Server 2008 R2, Server 2012).
Tested on 2012.
Ref:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa384274%28v=vs.85%29.aspx
Change-Id: I6f4f3226b25c890cd674bf4c4d9ea73ddfc8ece0
Reviewed-on: https://code.wireshark.org/review/12740
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | tools/win-setup.ps1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 7863da2c78..c09e741954 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -241,6 +241,7 @@ function Bootstrap7Zip() { $searchDirs = @( "${env:ProgramFiles}\7-Zip" "${env:ProgramFiles(x86)}\7-Zip" + "${env:ProgramW6432}\7-Zip" "${env:ChocolateyInstall}\bin" "${env:ChocolateyInstall}\tools" "$binDir" |