diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-07-26 15:11:04 +0200 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2014-07-28 18:32:24 +0000 |
| commit | 9ce04cbb091bd8e4ae5a36a1b31771189e0d9600 (patch) | |
| tree | e00e955e6588dd5bf604d5d9c44f5d3c58d1a3e1 /tools | |
| parent | 0f85608d3a29ae4b19adefe237540e9714e6fc43 (diff) | |
Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set
Bug: 10317
Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723
Reviewed-on: https://code.wireshark.org/review/3203
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/win-setup.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/win-setup.sh b/tools/win-setup.sh index 8ec474ba58..023975f134 100755 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -41,7 +41,7 @@ usage () { echo "Usage:" echo " $0 --appverify <appname> [<appname>] ..." echo " $0 --libverify <destination> <subdirectory> <package>" - echo " $0 --download <destination> <subdirectory> <package> <tag>" + echo " $0 --download <destination> <subdirectory> <package> <tag> <platform>" echo " $0 --settag <destination> <tag>" echo " $0 --checktag <destination> <tag>" echo "" @@ -159,13 +159,14 @@ case "$1" in fi ;; --download) - if [ -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" ] ; then + if [ -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" ] ; then usage fi DEST_PATH=$(cygpath "$2") DEST_SUBDIR=$3 PACKAGE_PATH=$4 DOWNLOAD_TAG=$5 + WIRESHARK_TARGET_PLATFORM=$6 if [ -z "$WIRESHARK_TARGET_PLATFORM" ]; then err_exit "WIRESHARK_TARGET_PLATFORM not defined" |