diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-06-06 14:40:16 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-06 21:40:40 +0000 |
| commit | 63dc1299ae8ee1fb3c857d8292e68428c9aeeacd (patch) | |
| tree | d1b1599465cb977a552d3d6dd401c192a9c49408 /packaging/macosx/osx-app.sh | |
| parent | 2b2fbff2dc2af6f47edda62cedd22b22d6c9d9e0 (diff) | |
Get rid of some stuff left over from the days of drag-install.
We're not using the Utilities directory; don't create it and don't fill
it in.
Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789
Reviewed-on: https://code.wireshark.org/review/2009
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging/macosx/osx-app.sh')
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index be6d1fc7e0..1f82c96018 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -38,9 +38,6 @@ strip=false binary_path="/tmp/inst/bin" plist="./Info.plist" -util_dir="./Utilities" -cli_dir="$util_dir/Command Line" -chmodbpf_dir="$util_dir/ChmodBPF" exclude_prefixes="/System/|/Library/|/usr/lib/|/usr/X11/|/opt/X11/|@rpath|@executable_path" @@ -225,8 +222,6 @@ mkdir -p "$pkgqtplugin" mkdir -p "$pkgplugin" mkdir -p "$pkgpython" -mkdir -p "$cli_dir" - if [ "$ui_toolkit" = "qt" ] ; then cp "$binary_path/$wireshark_bin_name" "$pkgexec/Wireshark" else @@ -248,9 +243,6 @@ fi #---------------------------------------------------------- echo -e "\nFilling app bundle and utility directory...\n" -# CLI wrapper -cp -v utility-launcher "$cli_dir/wireshark" - # Wireshark executables if [ "$ui_toolkit" = "gtk" ] ; then for binary in $binary_list wireshark ; do @@ -262,7 +254,6 @@ if [ "$ui_toolkit" = "gtk" ] ; then if [ "$binary" != "wireshark" ] ; then ln -sv ./wireshark "$pkgbin/$binary" - ln -sv ./wireshark "$cli_dir/$binary" fi done elif [ "$ui_toolkit" = "qt" ] ; then @@ -273,11 +264,6 @@ elif [ "$ui_toolkit" = "qt" ] ; then done fi -# ChmodBPF -mkdir -p "$chmodbpf_dir" -cp -v ChmodBPF/* "$chmodbpf_dir" -chmod -R g-w "$chmodbpf_dir" - # The rest of the Wireshark installation (we handled bin above) rsync -av \ --exclude bin/ \ |