diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-01-04 03:05:14 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-01-04 11:06:19 +0000 |
| commit | 2cc215c7d0b07c2be3d5d5908664f5e9b9bdc0de (patch) | |
| tree | dedfb5007f8cd8726058f1dcc5de7243d4923412 /packaging/macosx/osx-app.sh | |
| parent | 0aba97a938832f7b9ffe6ec6531cc41b2d96f998 (diff) | |
Running Wireshark through a symlink doesn't work.
We can't just symbolically link to the executables, as that means that
the executable won't be in Contents/MacOS, which means that all
@executable_path-relative references will go to the wrong place if we
run the executables using the symlink, which means that the executables
could fail (they *do* fail to find the Cocoa Qt plugin, for example).
So, instead, we go back to the old version of the utility launcher, and
put that in Contents/Resources/bin as well as, if the user requests the
CLI utilities, /usr/local/bin. Maybe PackageMaker will find that
acceptable and include them in the installer package.
Bug: 13270
Change-Id: I4016b58c9ce0df05d78525d35e53431750c2b4d9
Reviewed-on: https://code.wireshark.org/review/19536
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx/osx-app.sh')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5356d7434f..158b930496 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -290,11 +290,18 @@ create_bundle() { done # - # Links to executables + # Executable launchers in $pkgbin # - ln -s ../../MacOS/Wireshark $pkgbin/wireshark + # We can't just symbolically link to the executables, as + # that means that the executable won't be in Contents/MacOS, + # which means that all @executable_path-relative references + # will go to the wrong place if we run the executables using + # the symlink, which means that the executables could fail + # (they *do* fail to find the Cocoa Qt plugin, for example). + # + cp utility-launcher/wireshark $pkgbin for binary in $cli_binary_list ; do - ln -s ../../MacOS/$binary $pkgbin/$binary + ln -s ./wireshark $pkgbin/$binary done # The rest of the Wireshark installation (we handled bin above) |