Wireshark-commits: [Wireshark-commits] master-2.2 b8675cb: Running Wireshark through a symlink does

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 4 Jan 2017 20:03:47 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b8675cb888d39af52c4882acd978379ca1352050
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

b8675cb 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: I85fe201cff3527748ab19f18ec120a40cea1982a
    Reviewed-on: https://code.wireshark.org/review/19546
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  cc982a0   Oops, source and target are the other way around.
    adds  b8675cb   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(-)