Skip to content

Commit 77156d6

Browse files
committed
fixed all the OS X/MacOS to macOS
1 parent 724fafe commit 77156d6

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

docs/about/open-source.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ Please note that we offer no support for running Binary Ninja with modified Qt l
5959
1. Follow the installation requirements on the [Building Qt 6 from Git] page.
6060
2. Download the Qt 6.1.3 [tarball] from binary.ninja. The Qt code has a [patch] applied but is ABI compatible with the official Qt release.
6161
3. Next, build QT using the aforementioned instructions.
62-
4. On OS X, you will need to disable the code-signing signature since it would otherwise prevent changes to binaries or shared libraries. We recommend a tool such as [unsign].
62+
4. On macOS, you will need to disable the code-signing signature since it would otherwise prevent changes to binaries or shared libraries. We recommend a tool such as [unsign].
6363
5. Finally, replace the built libraries:
64-
- On OS X, replace the `QtCore.framework`, `QtDBus.framework`, `QtGui.framework`, `QtNetwork.framework`, `QtPrintSupport.framework`, `QtWidgets.framework` folders inside of `/Applications/Binary Ninja.app/Contents/Frameworks`
64+
- On macOS, replace the `QtCore.framework`, `QtDBus.framework`, `QtGui.framework`, `QtNetwork.framework`, `QtPrintSupport.framework`, `QtWidgets.framework` folders inside of `/Applications/Binary Ninja.app/Contents/Frameworks`
6565
- On Windows, replace the `Qt6Core.dll`, `Qt6Gui.dll`, `Qt6Network.dll`, and `Qt6Widgets.dll` files in `C:\Program Files\Vector35\BinaryNinja\`.
6666
- On Linux, replace the `libQt6Core.so.6`, `libQt6DBus.so.6`, `libQt6Gui.so.6`, `libQt6Network.so.6`, `libQt6Widgets.so.6`, `libQt6XcbQpa.so.6` files wherever Binary Ninja was extracted.
6767

docs/dev/batch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This script adds appropriate `.pth` files so that your Python can find the Binar
1616

1717
## Our First Script
1818

19-
Let's try a simple example script (note that this script will work identically on MacOS and Linux, but Windows users will want to adjust paths accordingly):
19+
Let's try a simple example script (note that this script will work identically on macOS and Linux, but Windows users will want to adjust paths accordingly):
2020

2121
```python
2222
#!/usr/bin/env python3

docs/getting-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ Here's a list of all built-in settings currently available from the UI:
747747
|network|Enable Release Notes|Allow Binary Ninja to connect to the update server to display release notes on new tabs.|`boolean`|`True`|[`SettingsUserScope`]|<a id='network.enableReleaseNotes'>network.enableReleaseNotes</a>|
748748
|network|Enable Update Channel List|Allow Binary Ninja to connect to the update server to determine which update channels are available.|`boolean`|`True`|[`SettingsUserScope`]|<a id='network.enableUpdateChannelList'>network.enableUpdateChannelList</a>|
749749
|network|Enable Updates|Allow Binary Ninja to connect to the update server to check for updates.|`boolean`|`True`|[`SettingsUserScope`]|<a id='network.enableUpdates'>network.enableUpdates</a>|
750-
|network|HTTPS Proxy|Override default HTTPS proxy settings. By default, HTTPS Proxy settings are detected and used automatically via environment variables (e.g., https_proxy). Alternatively, proxy settings are obtained from the Internet Settings section of the Windows registry, or the Mac OS X System Configuration Framework.|`string`| |[`SettingsUserScope`]|<a id='network.httpsProxy'>network.httpsProxy</a>|
750+
|network|HTTPS Proxy|Override default HTTPS proxy settings. By default, HTTPS Proxy settings are detected and used automatically via environment variables (e.g., https_proxy). Alternatively, proxy settings are obtained from the Internet Settings section of the Windows registry, or the Mac macOS System Configuration Framework.|`string`| |[`SettingsUserScope`]|<a id='network.httpsProxy'>network.httpsProxy</a>|
751751
|network|Websocket Provider|Specify the registered WebsocketProvider which enables communication over HTTPS.|`string`|`CoreWebsocketProvider`|[`SettingsUserScope`]|<a id='network.websocketProviderName'>network.websocketProviderName</a>|
752752
| | | |`enum`|`CoreWebsocketProvider`| | |
753753
|pdb|Auto Download PDBs|Automatically download pdb files from specified symbol servers.|`boolean`|`True`|[`SettingsProjectScope`, `SettingsUserScope`]|<a id='pdb.autoDownload'>pdb.autoDownload</a>|

docs/guide/plugins.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The most common Binary Ninja plugins are Python which we are covering here. That
44

55
Plugins are loaded from the user's plugin folder:
66

7-
- OS X: `~/Library/Application Support/Binary Ninja/plugins/`
7+
- macOS: `~/Library/Application Support/Binary Ninja/plugins/`
88
- Linux: `~/.binaryninja/plugins/`
99
- Windows: `%APPDATA%\Binary Ninja\plugins`
1010

@@ -17,17 +17,17 @@ Note that plugins installed via the [PluginManager API](https://api.binary.ninja
1717
Plugins can now be installed directly via the GUI from Binary Ninja. You can launch the plugin manager via any of the following methods:
1818

1919
- (Linux/Windows) `[CTRL-SHIFT-M]`
20-
- (MacOS) `[CMD-SHIFT-M]`
20+
- (macOS) `[CMD-SHIFT-M]`
2121

2222
Or:
2323

2424
- (Linux/Windows) `Edit` / `Preferences` / `Manage Plugins`
25-
- (MacOS) `Binary Ninja` / `Preferences` / `Manage Plugins`
25+
- (macOS) `Binary Ninja` / `Preferences` / `Manage Plugins`
2626

2727
Or:
2828

2929
- (Linux/Windows) `[CTRL-P]` / `Plugin Manager` / `[ENTER]`
30-
- (MacOS) `[CMD-P]` / `Plugin Manager` / `[ENTER]`
30+
- (macOS) `[CMD-P]` / `Plugin Manager` / `[ENTER]`
3131

3232
Note that some plugins may show `Force Install` instead of the normal `Install` button. If that's the case, it means the plugin does not specifically advertise support for your platform or version of python. Often times the plugin will still work, but you must override a warning to confirm installation and be aware that the plugin may not be compatible.
3333

@@ -88,7 +88,7 @@ Then just restart and your plugin will be loaded.
8888

8989
Binary Ninja can now automatically install pip requirements for python plugins when the plugin was installed using the plugin manager. If the plugin author has included a `requirements.txt` file, the plugin manager will automatically install those dependencies.
9090

91-
Because Windows and MacOS ship with an embedded version of Python, if you want to install plugins inside that Python, we recommend instead installing an official [python.org](https://www.python.org/downloads/windows/) (NOTE: ensure you do not accidentally install a 32-bit build) version, or a [homebrew](https://docs.brew.sh/Homebrew-and-Python) Python 3.x build.
91+
Because Windows and macOS ship with an embedded version of Python, if you want to install plugins inside that Python, we recommend instead installing an official [python.org](https://www.python.org/downloads/windows/) (NOTE: ensure you do not accidentally install a 32-bit build) version, or a [homebrew](https://docs.brew.sh/Homebrew-and-Python) Python 3.x build.
9292

9393
Then you can adjust your [python.interpreter setting](../getting-started.md#python.interpreter) to point to the appropriate install location. Note that the file being pointed to should be a `.dll` or `.dylib` though homebrew will often install libraries without any extension. For example:
9494

@@ -102,7 +102,7 @@ $ file /usr/local/Cellar/python@3.8/3.8.5/Frameworks/Python.framework/Versions/3
102102
Troubleshooting many Binary Ninja problems is enhanced by enabling debug logs and logging the output to a file. Just launch Binary Ninja with:
103103

104104
``` text
105-
/Applications/Binary\ Ninja.app/Contents/MacOS/binaryninja -d -l /tmp/bnlog.txt
105+
/Applications/Binary\ Ninja.app/Contents/macOS/binaryninja -d -l /tmp/bnlog.txt
106106
```
107107

108108
And check `/tmp/bnlog.txt` when you're done.

docs/guide/troubleshooting.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Next, if running a python plugin, make sure the python requirements are met by y
4343

4444
## Running as Root
4545

46-
Binary Ninja will refuse to run as root on Linux and MacOS platforms (this is partially enforced by the usage of an embedded QWebEngine which will not run as root). You can work-around this issue by either running as a regular user, or forcing BN to launch but you will need to also disable [active content](/getting-started/#updates.activeContent). If you try to use su or another similar tool, make sure that user has permission to the X11 session.
46+
Binary Ninja will refuse to run as root on Linux and macOS platforms (this is partially enforced by the usage of an embedded QWebEngine which will not run as root). You can work-around this issue by either running as a regular user, or forcing BN to launch but you will need to also disable [active content](/getting-started/#updates.activeContent). If you try to use su or another similar tool, make sure that user has permission to the X11 session.
4747

4848
## API
4949

@@ -81,11 +81,11 @@ You may also manually create a `settings.json` file in your [user folder](../get
8181
}
8282
```
8383

84-
### MacOS
84+
### macOS
8585

8686
#### Xcode Installed Python 3
8787

88-
If you're running Catlina MacOS with the Python 3 installed by XCode and wish to use that version of Python with Binary Ninja, you'll need to do the following:
88+
If you're running Catlina macOS with the Python 3 installed by XCode and wish to use that version of Python with Binary Ninja, you'll need to do the following:
8989

9090
1. Set the PYTHONHOME environment variable for your user to the following: `PYTHONHOME=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.7`
9191
1. If you have an existing `settings.json` in `~/Library/Application Support/Binary Ninja/` merge the below, or create it with these contents if it does not exist:
@@ -103,19 +103,19 @@ If you're running Catlina MacOS with the Python 3 installed by XCode and wish to
103103
}
104104
```
105105

106-
#### Old MacOS
106+
#### Old macOS
107107

108-
While OS X is generally the most trouble-free environment for Binary Ninja, very old versions may have problems with the RPATH for our binaries and libraries. There are two solutions. First, run Binary Ninja with:
108+
While macOS is generally the most trouble-free environment for Binary Ninja, very old versions may have problems with the RPATH for our binaries and libraries. There are two solutions. First, run Binary Ninja with:
109109

110110
``` bash
111-
DYLD_LIBRARY_PATH="/Applications/Binary Ninja.app/Contents/MacOS" /Applications/Binary\ Ninja.app/Contents/MacOS/binaryninja
111+
DYLD_LIBRARY_PATH="/Applications/Binary Ninja.app/Contents/macOS" /Applications/Binary\ Ninja.app/Contents/macOS/binaryninja
112112
```
113113

114114
Or second, modify the binary itself using the [install_name_tool](https://blogs.oracle.com/dipol/dynamic-libraries,-rpath,-and-mac-os).
115115

116116
#### Non-brew installed Python 3
117117

118-
One potential issue for installed Python 3.x versions on MacOS is that the bundled certificates do not align with the native certificate store. This results in an error while attempting to download updates using the python provider. One of the following may fix this:
118+
One potential issue for installed Python 3.x versions on macOS is that the bundled certificates do not align with the native certificate store. This results in an error while attempting to download updates using the python provider. One of the following may fix this:
119119

120120
``` bash
121121
pip install --upgrade certifi

docs/guide/type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ current_function.parameter_vars[0].type = Type.pointer(bv.arch, Type.char())
525525

526526
Type Libraries are collections of type information (structs, enums, function types, etc.) stored in a file with the extension `.bntl`.
527527

528-
Relative to the binaryninja executable, the default type library location is `../Resources/typelib` on MacOS and `./typelib` on Linux and Windows. Individual .bntl files are organized in subdirectories named for the supported architecture. Users may include their own type libraries
528+
Relative to the binaryninja executable, the default type library location is `../Resources/typelib` on macOS and `./typelib` on Linux and Windows. Individual .bntl files are organized in subdirectories named for the supported architecture. Users may include their own type libraries
529529

530530
The information in a type library is contained in two key-value stores:
531531

0 commit comments

Comments
 (0)