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>

2 files changed, 1 insertions, 28 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/ \
diff --git a/packaging/macosx/osx-dmg.sh.in b/packaging/macosx/osx-dmg.sh.in
index 1f390ac71a..636f6651de 100755
--- a/packaging/macosx/osx-dmg.sh.in
+++ b/packaging/macosx/osx-dmg.sh.in
@@ -42,7 +42,6 @@ rw_name="RWwireshark.dmg"
 volume_name="Wireshark"
 tmp_dir="/tmp/dmg-$$"
 auto_open_opt=
-utilities="Utilities"
 ws_bin="$app_bundle/Contents/Resources/bin/wireshark-bin"
 readme_name="Read_me_first_gtk.rtf"
 
@@ -110,12 +109,6 @@ if [ ! -e "$app_bundle" ]; then
 	exit 1
 fi
 
-# Safety checks
-if [ ! -e "$utilities" ]; then
-	echo "Cannot find utilities: $utilities"
-	exit 1
-fi
-
 # Get the architecture
 case `file $ws_bin` in
 	*Mach-O*64-bit*x86_64*)
@@ -177,14 +170,8 @@ rm -rf "$tmp_dir"
 mkdir "$tmp_dir" || exit 1
 
 echo -e "Copying files to temp directory"
-# Wireshark itself
-# Copy Wireshark.app
+# Copy the installer package
 cp "$pkg_file" "$tmp_dir"/ || exit 1
-# Link to Applications in order to drag and drop wireshark onto it
-#ln -sf /Applications "$tmp_dir"/
-# Copy the utilites
-#cp -rf "$utilities" "$tmp_dir"/
-#ln -sf /Library/StartupItems "$tmp_dir/$utilities"/
 # Copy the readme
 cp "$readme_name" "$tmp_dir"/"Read me first.rtf" || exit 1