From 99b58131d8897e036210f443d8fe7c73edc90289 Mon Sep 17 00:00:00 2001 From: Graham Bloice Date: Thu, 23 Jul 2015 22:36:09 +0100 Subject: 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 --- tools/win-setup.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/win-setup.ps1') 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) { -- cgit v1.2.3