diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2015-07-23 22:36:09 +0100 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2015-07-23 21:38:56 +0000 |
| commit | 99b58131d8897e036210f443d8fe7c73edc90289 (patch) | |
| tree | 689603b173c253f5c9ac9b97fe3074ad3d5a29a2 /tools/win-setup.ps1 | |
| parent | da5eba636a1bb4de2a5e09a1ec7e4191fbe77976 (diff) | |
Fix 7-zip search
The path for a Chocolatey 7zip.commandline install is
$env:ChocolateyInstall\bin
and the version installed by Chocolatey for its own use is in
$env:ChocolateyInstall\tools
Change-Id: I2f1ee78e93f861075f8c06ed74d81d8173911299
Reviewed-on: https://code.wireshark.org/review/9762
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'tools/win-setup.ps1')
| -rw-r--r-- | tools/win-setup.ps1 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 3d9ff5a91f..7736397624 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -237,7 +237,8 @@ function Bootstrap7Zip() { $searchDirs = @( "${env:ProgramFiles}\7-Zip" "${env:ProgramFiles(x86)}\7-Zip" - "${env:ChocolateyInstall}\chocolateyinstall\tools" + "${env:ChocolateyInstall}\bin" + "${env:ChocolateyInstall}\tools" ) foreach ($dir in $searchDirs) { |