diff options
| author | Graham Bloice <graham.bloice@trihedral.com> | 2013-06-19 23:06:14 +0000 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2013-06-19 23:06:14 +0000 |
| commit | e6e7c1181bd33a94de00e137685f39520bd858dc (patch) | |
| tree | 6461dcd81af73db5c7a903a004d8eca36cb2540e /tools/win-setup.sh | |
| parent | 21a682ea24906819bf64fac5b36e3ebc82ced2f2 (diff) | |
From Orgad Shaneh via bug 8308 - allow a relative path for the WIRESHARK_LIBS location.
svn path=/trunk/; revision=50065
Diffstat (limited to 'tools/win-setup.sh')
| -rwxr-xr-x | tools/win-setup.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/win-setup.sh b/tools/win-setup.sh index fa253322cd..9d6a039d45 100755 --- a/tools/win-setup.sh +++ b/tools/win-setup.sh @@ -173,13 +173,14 @@ case "$1" in err_exit "Can't create '$DEST_PATH/$DEST_SUBDIR'" fi cd "$DEST_PATH" || err_exit "Can't find '$DEST_PATH'" + PKG_PATH="$PWD" wget $use_proxy -nc "$DOWNLOAD_PREFIX/$PACKAGE_PATH" || \ 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'" + echo "Extracting '$PKG_PATH/$PACKAGE' into '$PKG_PATH/$DEST_SUBDIR'" if [[ "$PACKAGE" == *.zip ]] ; then - unzip -oq "$DEST_PATH/$PACKAGE" || - err_exit "Couldn't unpack '$DEST_PATH/$PACKAGE'" + unzip -oq "$PKG_PATH/$PACKAGE" || + err_exit "Couldn't unpack '$PKG_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. |