osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't unload the XQuartzFixer job if it doesn't exist. 

But *do* get rid of the pre-launchd XQuartzFixer startup item; it's
probably not there, but we might as well leave things as clean as we
can.

Change-Id: Icfdbe6c0d022cde8cf30bd3c79fbf77896e6fe98
Reviewed-on: https://code.wireshark.org/review/30322
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-10-21 23:27:47 -07:00
parent 5490e4f8c4
commit e4e6beadb1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packaging/macosx/Scripts/wireshark-postinstall.sh
View File

@ -42,10 +42,18 @@ fi
echo $WSMANPATH > /etc/manpaths.d/Wireshark
#
# Get rid of the old XQuartz fixer; we don't use X11, and haven't used
# it since Wireshark 2.0, so we don't need it.
# If we still have the old XQuartz fixer, get rid of it; we don't use
# X11, and haven't used it since Wireshark 2.0, so we don't need it.
#
XQUARTZ_FIXER_PLIST="/Library/LaunchDaemons/org.wireshark.XQuartzFixer.plist"
launchctl unload $XQUARTZ_FIXER_PLIST
rm -rf /Library/Application Support/Wireshark/XQuartzFixer
rm -f $XQUARTZ_FIXER_PLIST
if [ -e "$XQUARTZ_FIXER_PLIST ]
then
launchctl unload $XQUARTZ_FIXER_PLIST
rm -rf /Library/Application Support/Wireshark/XQuartzFixer
rm -f $XQUARTZ_FIXER_PLIST
fi
#
# And get rid of the *really* old XQuartz fixer while we're at it.
#
rm -rf /Library/StartupItems/XQuartzFixer