diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-07-21 08:49:39 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-07-21 15:54:46 +0000 |
| commit | f38d976cbed60c370e127bd40396cedf17644cee (patch) | |
| tree | 59c723dffb5d971e889bb3e5c35f74040211ba4d /tools/win-setup.ps1 | |
| parent | 573b33a5a347688ae56f75629007f5ea75e2dd45 (diff) | |
| download | wireshark-f38d976cbed60c370e127bd40396cedf17644cee.tar.gz | |
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>
Diffstat (limited to 'tools/win-setup.ps1')
| -rw-r--r-- | tools/win-setup.ps1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index b6db4b5cff..3d9ff5a91f 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -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 |