Skip to content

Commit

Permalink
refactor(macos): Update osx to macos
Browse files Browse the repository at this point in the history
Apple is changing their desktop OS to match their other OS product
names (e.g., iOS, tvOS).  OS X will now be macOS.
  • Loading branch information
Derek Michael Frank committed Jul 14, 2016
1 parent 536f518 commit bfb4bd1
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Everything is configured and tweaked within `~/.dotfiles`.
The main file you'll want to change right off the bat is `zsh/zshrc.symlink`,
which sets up a few paths that'll be different on your particular machine.

`dot` is a simple script that installs some dependencies, sets sane OS X
`dot` is a simple script that installs some dependencies, sets sane macOS
defaults, and so on. Tweak this script, and occasionally run `dot` from
time to time to keep your environment fresh and up-to-date. You can find
this script in `bin/`.
Expand Down
4 changes: 2 additions & 2 deletions bin/dot
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
# to make sure you're on the latest and greatest.
export ZSH=$HOME/.dotfiles

# Set OS X defaults
$ZSH/osx/set-defaults.sh
# Set macOS defaults
$ZSH/macos/set-defaults.sh

# Install homebrew
$ZSH/homebrew/install.sh 2>&1
Expand Down
4 changes: 2 additions & 2 deletions bin/set-defaults
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
#
# Sets OS X defaults by running $ZSH/osx/set-defaults.sh.
# Sets macOS defaults by running $ZSH/macos/set-defaults.sh.

exec $ZSH/osx/set-defaults.sh
exec $ZSH/macos/set-defaults.sh
2 changes: 1 addition & 1 deletion functions/extract
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Usage: extract <file>
# Description: extracts archived files / mounts disk images
# Note: .dmg/hdiutil is Mac OS X-specific.
# Note: .dmg/hdiutil is macOS-specific.
#
# credit: http://nparikh.org/notes/zshrc.txt
extract () {
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions osx/set-defaults.sh → macos/set-defaults.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Sets reasonable OS X defaults.
# Sets reasonable macOS defaults.
#
# Or, in other words, set shit how I like in OS X.
# Or, in other words, set shit how I like in macOS.
#
# The original idea (and a couple settings) were grabbed from:
# https://github.com/mathiasbynens/dotfiles/blob/master/.osx
# https://github.com/mathiasbynens/dotfiles/blob/master/.macos
#
# Run ./set-defaults.sh and you'll be good to go.

Expand Down Expand Up @@ -38,4 +38,4 @@ defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
defaults write com.apple.Safari IncludeDevelopMenu -bool true
defaults write com.apple.Safari WebKitDeveloperExtrasEnabledPreferenceKey -bool true
defaults write com.apple.Safari "com.apple.Safari.ContentPageGroupIdentifier.WebKit2DeveloperExtrasEnabled" -bool true
defaults write NSGlobalDomain WebKitDeveloperExtras -bool true
defaults write NSGlobalDomain WebKitDeveloperExtras -bool true

0 comments on commit bfb4bd1

Please sign in to comment.