Skip to content

Commit 679a722

Browse files
committed
OS X → macOS
1 parent 86d2172 commit 679a722

12 files changed

+34
-34
lines changed

how-not-to-rm-yourself.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ npm install --global trash-cli
1515
$ trash unicorn.png rainbow.png
1616
```
1717

18-
*Works on OS X, Linux, Windows. Requires [Node.js](http://nodejs.org).*
18+
*Works on macOS, Linux, Windows. Requires [Node.js](http://nodejs.org).*
1919

2020

2121
## Safeguard `rm`
@@ -41,7 +41,7 @@ Even though you don't use `rm` directly, external scripts most likely will. Ther
4141
- Finally, in your `.zshrc` add `source ~/.common_profile` and `export BASH_ENV='~/.bashenv'`. Your `.common_profile`, `.bashenv`, `.zshenv` and `.zshrc` should end up looking like [this](https://gist.github.com/andbroby/958c6b4259290d4c884c).
4242

4343
- Install `coreutils` which includes a newer version of `rm` with the flag `--preserve-root` which is enabled by default and will prevent you from removing root.
44-
OS X: `brew install coreutils`
44+
macOS: `brew install coreutils`
4545
Linux: *Included by default.*
4646

4747
With this version of `rm` you can also choose to switch from `alias rm='rm -i'` to `alias rm='rm -I'` which is similar:

launch-app-on-startup-macos.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Launch app on startup
2+
3+
> How to have an macOS app launched on startup
4+
5+
6+
### Open `System Preferences`
7+
8+
![](images/launch-app-on-startup-macos/1.png)
9+
10+
### Click `Users & Groups`
11+
12+
![](images/launch-app-on-startup-macos/2.png)
13+
14+
### Click the `Login Items` tab and then the `+` button
15+
16+
![](images/launch-app-on-startup-macos/3.png)
17+
18+
### Go to the `Applications` folder
19+
20+
![](images/launch-app-on-startup-macos/4.png)
21+
22+
![](images/launch-app-on-startup-macos/5.png)
23+
24+
### Select the app you want to start at login and click `Add`
25+
26+
![](images/launch-app-on-startup-macos/6.png)

launch-app-on-startup-osx.md

-26
This file was deleted.

npm-global-without-sudo.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Install `npm` packages globally without sudo on OS X and Linux
1+
# Install `npm` packages globally without sudo on macOS and Linux
22

33
`npm` installs packages locally within your projects by default. You can also install packages globally (e.g. `npm install -g <package>`) (useful for command-line apps). However the downside of this is that you need to be root (or use `sudo`) to be able to install globally.
44

@@ -34,7 +34,7 @@ Check out [`npm-g_nosudo`](https://github.com/glenpike/npm-g_nosudo) for doing t
3434

3535
-
3636

37-
NOTE: If you are running OS X, the `.bashrc` file may not yet exist, and the terminal will be obtaining its environment parameters from another file, such as `.profile` or `.bash_profile`. These files also reside in the user's home folder. In this case, simply adding the following line to them will instruct Terminal to also load the `.bashrc` file:
37+
NOTE: If you are running macOS, the `.bashrc` file may not yet exist, and the terminal will be obtaining its environment parameters from another file, such as `.profile` or `.bash_profile`. These files also reside in the user's home folder. In this case, simply adding the following line to them will instruct Terminal to also load the `.bashrc` file:
3838

3939
```sh
4040
source ~/.bashrc

readme.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
- [Set environment variables](set-environment-variables.md)
99
- [How not to `rm` yourself](how-not-to-rm-yourself.md)
10-
- [Install npm packages globally without sudo](npm-global-without-sudo.md) *(OS X & Linux)*
10+
- [Install npm packages globally without sudo](npm-global-without-sudo.md) *(macOS & Linux)*
1111
- [Run a Node.js server alongside Apache](run-node-server-alongside-apache.md) *(Linux)*
12-
- [Launch app on startup](launch-app-on-startup-osx.md) *(OS X)*
13-
- [Use npm through a corporate proxy](npm-proxy.md) *(OS X & Linux)*
12+
- [Launch app on startup](launch-app-on-startup-macos.md) *(macOS)*
13+
- [Use npm through a corporate proxy](npm-proxy.md) *(macOS & Linux)*
1414
- [Run Docker commands without sudo](docker-without-sudo.md) *(Linux)*
1515

1616

set-environment-variables.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
> They are part of the operating environment in which a process runs. For example, a running process can query the value of the TEMP environment variable to discover a suitable location to store temporary files, or the HOME or USERPROFILE variable to find the directory structure owned by the user running the process.
66
77

8-
## OS X
8+
## macOS
99

1010
1. Find out if you're using Bash or ZSH by running the command `echo $SHELL` in your Terminal.
1111

0 commit comments

Comments
 (0)