osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Be more careful about variable scope and quoting. 

Change-Id: Ica226178cb43b82a87441fe11e8c2093e01db8a5
Reviewed-on: https://code.wireshark.org/review/9738
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-07-21 08:49:39 -07:00
parent 573b33a5a3
commit f38d976cbe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/win-setup.ps1
View File

@ -196,7 +196,7 @@ $CleanupItems = @(
)
[Uri] $DownloadPrefix = "https://anonsvn.wireshark.org/wireshark-$($Platform)-libs/tags/$($CurrentTag)/packages"
$SevenZip = "7-zip-not-found"
$Global:SevenZip = "7-zip-not-found"
# Functions
@ -273,7 +273,7 @@ function DownloadArchive($fileName, $subDir) {
}
$activity = "Extracting into $($archiveDir)"
Write-Progress -Activity "$activity" -Status "Running 7z x $archiveFile ..."
& $SevenZip x "-o$archiveDir" -y "$archiveFile" 2>&1 |
& "$SevenZip" x "-o$archiveDir" -y "$archiveFile" 2>&1 |
Set-Variable -Name SevenZOut
$bbStatus = $LASTEXITCODE
Write-Progress -Activity "$activity" -Status "Done" -Completed