diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-08-12 00:59:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-08-12 00:59:34 +0000 |
| commit | 237c5a7b606a54d9d25f0d6bd6a3e5efe48fe6a0 (patch) | |
| tree | c5d98cf290d3c80ce70efe3b4dc8d034b26e00c1 /packaging/macosx | |
| parent | bf0f0ec4d9bcbda4d1a3c683d981cfc9b5d32223 (diff) | |
If we weren't started with special privileges, try to figure out if
we're running from inside an OS X app bundle and, if we are, save the
pathname of the top-level bundle directory and use it to get the
pathnames of global data files, plugins, and Python modules.
This obviates the need to set special environment variables for them in
the launcher scripts, so get rid of the commands to do that.
The @rpathification of binaries also obviates the need for the
commented-out setting of DYLD_LIBRARY_PATH, so get rid of that as well.
svn path=/trunk/; revision=51306
Diffstat (limited to 'packaging/macosx')
| -rwxr-xr-x | packaging/macosx/Resources/bin/wireshark | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/packaging/macosx/Resources/bin/wireshark b/packaging/macosx/Resources/bin/wireshark index cc347ac61e..0db6b8cf11 100755 --- a/packaging/macosx/Resources/bin/wireshark +++ b/packaging/macosx/Resources/bin/wireshark @@ -28,12 +28,6 @@ APPNAME=`basename "$0"` # MacPorts (former DarwinPorts) export PATH="/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" -# export DYLD_LIBRARY_PATH="$TOP/lib" - -export WIRESHARK_DATA_DIR="$TOP/share/wireshark" -export WIRESHARK_PLUGIN_DIR="$TOP/lib/wireshark/plugins" -export WIRESHARK_PYTHON_DIR="$TOP/lib/wireshark/python" - if [ "$APPNAME" == "wireshark" ] ; then # Apply GUI settings # For Panther and Tiger, override the default fontconfig configuration # XXX - This apparently isn't needed? |