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>

diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 3d9ff5a91f4aae5c58a37733bb7571279e3dcde7..7736397624a075f7348591a55819fd495bbe6618 100644 (file)
--- 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) {