diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-13 21:28:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-13 21:28:28 +0000 |
| commit | 1b1a1e6a3e4131ea0fd47b2bc6b05ddecaf9910a (patch) | |
| tree | 601fe839759501d74b6579751767ffb707ff324a /tools/win-setup.sh | |
| parent | 353823a2df6ebe9a9a9656c923aa5cc637932361 (diff) | |
| download | wireshark-1b1a1e6a3e4131ea0fd47b2bc6b05ddecaf9910a.tar.gz | |
Remove our local copy of WinPcap and download it from
wireshark-win{32,64}-libs instead. In win-setup.sh only try to unzip
files ending in .zip. PortableApps and U3 packaging changes are untested.
svn path=/trunk/; revision=44888
Diffstat (limited to 'tools/win-setup.sh')
| -rwxr-xr-x | tools/win-setup.sh | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/tools/win-setup.sh b/tools/win-setup.sh index 5945b40ef9..fa253322cd 100755 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -177,19 +177,21 @@ case "$1" in err_exit "Can't download $DOWNLOAD_PREFIX/$PACKAGE_PATH" cd "$DEST_SUBDIR" || err_exit "Can't find $DEST_SUBDIR" echo "Extracting '$DEST_PATH/$PACKAGE' into '$DEST_PATH/$DEST_SUBDIR'" - unzip -oq "$DEST_PATH/$PACKAGE" || - err_exit "Couldn't unpack '$DEST_PATH/$PACKAGE'" - echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable." - # XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below - # which may be more than those just unzipped depending upon DEST_SUBDIR. - # This may cause extra repeated checks but will do no harm. - for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do - if [ ! -x "$i" ] ; then - echo "Changing file permissions (add executable bit) to:" - echo "$i" - chmod a+x "$i" - fi - done + if [[ "$PACKAGE" == *.zip ]] ; then + unzip -oq "$DEST_PATH/$PACKAGE" || + err_exit "Couldn't unpack '$DEST_PATH/$PACKAGE'" + echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable." + # XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below + # which may be more than those just unzipped depending upon DEST_SUBDIR. + # This may cause extra repeated checks but will do no harm. + for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do + if [ ! -x "$i" ] ; then + echo "Changing file permissions (add executable bit) to:" + echo "$i" + chmod a+x "$i" + fi + done + fi ;; --settag) if [ -z "$2" ] ; then |