Wireshark-commits: [Wireshark-commits] master-2.2 f7ba00c: Add symlinks to Wireshark binaries in Re
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 16 Dec 2016 03:27:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f7ba00c06786f0a86f354da0d3e73982d2ea370c
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

f7ba00c by Guy Harris (guy@xxxxxxxxxxxx):

    Add symlinks to Wireshark binaries in Resources/bin, and point there.
    
    That way, $PATH points to .../Wireshark.app/Contents/Resources/bin, so
    the man command will look in
    .../Wireshark.app/Contents/Resources/share/man.
    
    This also may obviate the need to install the wrapper scripts in
    /usr/local/bin, although those scripts obviate the need to re-set PATH
    after installing Wireshark.
    
    Change-Id: I7202b5a0fe5d2b90c956dc0db2af073f6c08b00d
    Reviewed-on: https://code.wireshark.org/review/19296
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit d706f9c221e85992f7011baed53f5b31b7109493)
    Reviewed-on: https://code.wireshark.org/review/19299
    

Actions performed:

    from  ad5952a   Just use strncmp() to check the prefix of the file's first line.
    adds  f7ba00c   Add symlinks to Wireshark binaries in Resources/bin, and point there.


Summary of changes:
 packaging/macosx/Scripts/wireshark-postinstall.sh |    2 +-
 packaging/macosx/osx-app.sh                       |   49 +++++++++++++--------
 packaging/macosx/utility-launcher/wireshark       |   12 +----
 3 files changed, 33 insertions(+), 30 deletions(-)