aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2019-09-16 08:45:56 -0700
committerGerald Combs <gerald@wireshark.org>2019-09-18 16:49:54 +0000
commitcfb2d7eb80a3d5f4adb141c8a57ead12482171f4 (patch)
treed9a2336aeb3ef919258f3b2c8b45f791034c7b0e /packaging
parent74bccadff2080a45b6758a355e3c7737409832c4 (diff)
macOS: Don't clobber Wireshark.app during installation.
Removing Wireshark.app during preflight is the wrong way to ensure that we uninstall old assets. Bug: 16050 Change-Id: I39a0129e29830f8b6bc7ef228f3886db51d963ec Reviewed-on: https://code.wireshark.org/review/34542 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/Scripts/wireshark-preflight.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/packaging/macosx/Scripts/wireshark-preflight.sh b/packaging/macosx/Scripts/wireshark-preflight.sh
index b1561e15b1..bee0b2e8e0 100755
--- a/packaging/macosx/Scripts/wireshark-preflight.sh
+++ b/packaging/macosx/Scripts/wireshark-preflight.sh
@@ -8,6 +8,9 @@
OLD_APP="$2/Wireshark.app"
-if [ -d "$OLD_APP" ] ; then
- rm -rf "$OLD_APP"
-fi
+# This is the wrong way to go about ensuring that our installation is
+# deterministic.
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=16050
+#if [ -d "$OLD_APP" ] ; then
+# rm -rf "$OLD_APP"
+#fi