diff options
author | Gerald Combs <gerald@wireshark.org> | 2018-12-11 16:26:51 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2019-09-25 16:26:31 +0000 |
commit | ac4f3c0f4ddad04f0be16513357b3f03d6e565ab (patch) | |
tree | 9b15779caa9ef8839e43b4d3b4beba939f828115 /packaging/macosx/path_helper/uninstall-distribution.xml | |
parent | 1f779bf9c99a75e5ee0dfa709194235175fb809e (diff) |
macOS: Make Wireshark.app drag-installable.
Create ChmodBPF installer and uninstaller packages using pkgbuild and
productbuild. Place them in Wireshark.app/Resources/Extras.
Add a path_helper installer and uninstaller which respectively add and
remove /etc/*paths.d/Wireshark.
Remove the PackageMaker and utility-launcher assets and build targets.
Show a message in the main welcome screen if we don't have capture
permissions. Add an link which launches the ChmodBPF installer.
Add a "macOS Extras" item to About → Folders.
Migrate "Read me first" from RTF to Asciidoctor, which lets us add links
and looks like our other documentation.
Rename dmg_set_style.scpt to arrange_dmg.applescript and make it plain
text. Always run it in osx-dmg.sh.
Bug: 6991
Bug: 12593
Bug: 11399
Ping-Bug: 16074
Change-Id: I7b6aa89aae2be522b4141b0d44e8142dec749e90
Reviewed-on: https://code.wireshark.org/review/31047
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/macosx/path_helper/uninstall-distribution.xml')
-rw-r--r-- | packaging/macosx/path_helper/uninstall-distribution.xml | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/packaging/macosx/path_helper/uninstall-distribution.xml b/packaging/macosx/path_helper/uninstall-distribution.xml new file mode 100644 index 0000000000..69f6f5722f --- /dev/null +++ b/packaging/macosx/path_helper/uninstall-distribution.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Created using `productbuild -\-synthesize -\-package org.wireshark.uninstall.path.pkg /tmp/uninstall-distribution.xml` +See also: https://github.com/open-eid/osx-installer/blob/master/distribution.xml +https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/DistributionDefinitionRef/ +https://developer.apple.com/library/mac/documentation/DeveloperTools/Reference/InstallerJavaScriptRef/ +--> +<installer-gui-script minSpecVersion="1"> + <title>Add Wireshark to the system PATH</title> + <welcome language="en" mime-type="text/html"><![CDATA[<html><body><br /> +<p style="margin: 0px; font: 13px 'Lucida Grande'">This package will remove Wireshark and its associated utilities from the system PATH and MANPATH.</p></body></html>]]></welcome> + <pkg-ref id="org.wireshark.uninstall.path_helper.pkg"/> + <options customize="never" require-scripts="false"/> + <choices-outline> + <line choice="default"> + <line choice="org.wireshark.uninstall.path_helper.pkg"/> + </line> + </choices-outline> + <choice id="default"/> + <choice id="org.wireshark.uninstall.path_helper.pkg" visible="false"> + <pkg-ref id="org.wireshark.uninstall.path_helper.pkg"/> + </choice> + <pkg-ref id="org.wireshark.uninstall.path_helper.pkg" version="1.0" onConclusion="none">uninstall.path_helper.pkg</pkg-ref> +</installer-gui-script> |