diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-04-05 12:15:27 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-04-05 19:16:22 +0000 |
| commit | 357cfd3b035d1ba6438e82cc1cbec105874206b6 (patch) | |
| tree | 58a77b4dc8e1192db6278716b320bf42a18ded8f /packaging | |
| parent | 1f94d34f43055ea47fc9426e1720bdb4b7397dd9 (diff) | |
A bunch of "{Mac} OS X" -> "macOS" changes.
Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example. It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.
Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/macosx/ChmodBPF/ChmodBPF | 4 | ||||
| -rw-r--r-- | packaging/macosx/Info.plist.in | 2 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/packaging/macosx/ChmodBPF/ChmodBPF b/packaging/macosx/ChmodBPF/ChmodBPF index 7f16d328b7..516b264b03 100755 --- a/packaging/macosx/ChmodBPF/ChmodBPF +++ b/packaging/macosx/ChmodBPF/ChmodBPF @@ -1,10 +1,10 @@ #! /bin/bash # -# Unfortunately, Mac OS X's devfs is based on the old FreeBSD +# Unfortunately, macOS's devfs is based on the old FreeBSD # one, not the current one, so there's no way to configure it # to create BPF devices with particular owners or groups. BPF -# devices on Mac OS X are also non-cloning, that is they can +# devices on macOS are also non-cloning, that is they can # be created on demand at any time. This startup item will # pre-create a number of BPF devices, then make them owned by # the access_bpf group, with permissions rw-rw----, so that diff --git a/packaging/macosx/Info.plist.in b/packaging/macosx/Info.plist.in index a0ac89f216..323e6fdecc 100644 --- a/packaging/macosx/Info.plist.in +++ b/packaging/macosx/Info.plist.in @@ -146,7 +146,7 @@ <key>CFBundleTypeIconFile</key> <string>Wiresharkdoc.icns</string> <key>CFBundleTypeName</key> - <string>OS X PacketLogger Capture</string> + <string>macOS PacketLogger Capture</string> <key>CFBundleTypeRole</key> <string>Viewer</string> </dict> diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 158b930496..cb507ae17b 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -5,7 +5,7 @@ # -lp /path/to/wireshark/lib -ep /path/to/wireshark/extcap/binaries # -pp /path/to/wireshark/plugins -p /path/to/Info.plist # -# This script attempts to build an Wireshark.app bundle for OS X, resolving +# This script attempts to build an Wireshark.app bundle for macOS, resolving # dynamic libraries, etc. # It strips the executable and libraries if '-s' is given. # The Info.plist file can be found in the base wireshark directory once @@ -28,7 +28,7 @@ # NB: # This originally came from Inkscape; Inkscape's configure script has an # "--enable-osxapp", which causes some of Inkscape's installation data -# files to have OS X-ish paths under Contents/Resources of the bundle +# files to have macOS-ish paths under Contents/Resources of the bundle # or under /Library/Application Support. We don't have such an option; # we just put them in "bin", "etc", "lib", and "share" directories # under Contents/Resources, rather than in the "bin", "etc", "lib", @@ -97,7 +97,7 @@ fi help() { echo -e " -Create an app bundle for OS X +Create an app bundle for macOS USAGE $0 [-s] [-l /path/to/libraries] -bp /path/to/wireshark/binaries -p /path/to/Info.plist @@ -496,11 +496,11 @@ rpathify_file () { fi # - # Show the minimum supported version of OS X + # Show the minimum supported version of macOS # for each executable or library # if [[ "$filetype" = "EXECUTE" || "$filetype" = "DYLIB" ]] && [[ "$VERSION" -ge "7" ]] ; then - echo "Minimum OS X version for $1:" + echo "Minimum macOS version for $1:" otool -l $1 | grep -A3 LC_VERSION_MIN_MACOSX fi |