From bfb4bd13e2f91cb8684a89fce1529f9217fc48b4 Mon Sep 17 00:00:00 2001
From: Derek Michael Frank <derekmfrank@gmail.com>
Date: Wed, 13 Jul 2016 18:08:43 -0700
Subject: [PATCH] refactor(macos): Update osx to macos

Apple is changing their desktop OS to match their other OS product
names (e.g., iOS, tvOS).  OS X will now be macOS.
---
 README.md                      | 2 +-
 bin/dot                        | 4 ++--
 bin/set-defaults               | 4 ++--
 functions/extract              | 2 +-
 {osx => macos}/install.sh      | 0
 {osx => macos}/set-defaults.sh | 8 ++++----
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename {osx => macos}/install.sh (100%)
 rename {osx => macos}/set-defaults.sh (87%)

diff --git a/README.md b/README.md
index 978e5159b05..458749abcb8 100644
--- a/README.md
+++ b/README.md
@@ -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/`.
diff --git a/bin/dot b/bin/dot
index 4e0313bb995..4d3455621c0 100755
--- a/bin/dot
+++ b/bin/dot
@@ -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
diff --git a/bin/set-defaults b/bin/set-defaults
index 8a8d9a2ba27..333859619a8 100755
--- a/bin/set-defaults
+++ b/bin/set-defaults
@@ -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
\ No newline at end of file
+exec $ZSH/macos/set-defaults.sh
diff --git a/functions/extract b/functions/extract
index 39a6dd643d8..16640febbe0 100644
--- a/functions/extract
+++ b/functions/extract
@@ -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 () {
diff --git a/osx/install.sh b/macos/install.sh
similarity index 100%
rename from osx/install.sh
rename to macos/install.sh
diff --git a/osx/set-defaults.sh b/macos/set-defaults.sh
similarity index 87%
rename from osx/set-defaults.sh
rename to macos/set-defaults.sh
index 786ba8110fa..3f0723b1e17 100755
--- a/osx/set-defaults.sh
+++ b/macos/set-defaults.sh
@@ -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.
 
@@ -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
\ No newline at end of file
+defaults write NSGlobalDomain WebKitDeveloperExtras -bool true