diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-01-05 10:06:05 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-01-05 10:06:05 +0000 |
commit | 3fdc413fd6a1d4c6698da26f36753fb6a324b23a (patch) | |
tree | 7042d795b951346d620cba5c8a4f8d1f38142221 /packaging/macosx | |
parent | bf8fce3a008e5fc3e9509ea91573919079d097a1 (diff) |
In the post-install script, get rid of plugins that got converted to
built-in dissectors in 1.8. Hopefully, this will smash bug 7401.
svn path=/trunk/; revision=46945
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-x | packaging/macosx/Scripts/wireshark-postinstall.sh | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/packaging/macosx/Scripts/wireshark-postinstall.sh b/packaging/macosx/Scripts/wireshark-postinstall.sh index e85b6f2bb8..619806e6fe 100755 --- a/packaging/macosx/Scripts/wireshark-postinstall.sh +++ b/packaging/macosx/Scripts/wireshark-postinstall.sh @@ -1,3 +1,20 @@ #!/bin/sh -# This space intentionally left blank +# +# After an upgrade, get rid of leftover plugins that were converted +# to built-in dissectors, so that we won't have problems trying to load +# them (wrong instruction set, collisions with the built-ins, etc.). +# +# XXX - apparently, there's no longer a "postinstall" vs. "postupgrade" +# difference, but if you've never installed Wireshark before, this +# will just silently and harmlessly fail to remove files that aren't +# there in the first place. +# +PLUGINS="coseventcomm cosnaming interlink parlay sercosiii tango" + +PLUGINS_PATH="$2/Wireshark.app/Contents/Resources/lib/wireshark/plugins" + +for plugin in $PLUGINS +do + rm -f "$PLUGINS_PATH"/$plugin.so "$PLUGINS_PATH"/$plugin.la +done |