URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2cc215c7d0b07c2be3d5d5908664f5e9b9bdc0de
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
2cc215c by Guy Harris (guy@xxxxxxxxxxxx):
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@xxxxxxxxxxxx>
Actions performed:
from 0aba97a Oops, source and target are the other way around.
adds 2cc215c Running Wireshark through a symlink doesn't work.
Summary of changes:
packaging/macosx/Scripts/wireshark-postinstall.sh | 18 +-----------------
packaging/macosx/osx-app.sh | 13 ++++++++++---
packaging/macosx/utility-launcher/wireshark | 12 +++++++++++-
3 files changed, 22 insertions(+), 21 deletions(-)