Rename "Mac OS X" to "macOS" in comments

This only changes references in text for human consumption. It leaves
out renaming paths because that can cause breaking changes.

Related issue sorin-ionescu#1449.

modules/command-not-found/init.zsh

@@ -12,30 +12,9 @@ if [[ -s '/etc/zsh_command_not_found' ]]; then
 # Load command-not-found on Arch Linux-based distributions.
 elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
   source '/usr/share/doc/pkgfile/command-not-found.zsh'
-# Load command-not-found on macOS when Homebrew tap is configured.
-# To avoid performance penalty, we do not use Homebrew's ruby based command
-# lookup mechanism (viz., `brew command command-not-found-init`) and instead
-# `find` it ourselves from `TAP_DIRECTORY` defined internally in Homebrew.
-elif (( $+commands[brew] )); then
-  cnf_command=(
-    "$(brew --repository 2> /dev/null)"/Library/Taps/*/*/cmd/brew-command-not-found-init(|.rb)(.N)
-  )
-  if (( $#cnf_command )); then
-    cache_file="${TMPDIR:-/tmp}/prezto-brew-command-not-found-cache.$UID.zsh"
-
-    if [[ "${${(@o)cnf_command}[1]}" -nt "$cache_file" \
-          || "${ZDOTDIR:-$HOME}/.zpreztorc" -nt "$cache_file" \
-          || ! -s "$cache_file" ]]; then
-      # brew command-not-found-init is slow; cache its output.
-      brew command-not-found-init >! "$cache_file" 2> /dev/null
-    fi
-
-    source "$cache_file"
-
-    unset cache_file
-  fi
-
-  unset cnf_command
+# Load command-not-found on macOS when homebrew tap is configured.
+elif (( $+commands[brew] )) && brew command command-not-found-init > /dev/null 2>&1; then
+  eval "$(brew command-not-found-init)"
 # Return if requirements are not found.
 else
   return 1

modules/rsync/init.zsh

@@ -14,16 +14,15 @@ fi
 # Aliases
 #
 
-_rsync_cmd='rsync --verbose --progress --human-readable --compress --archive \
-  --hard-links --one-file-system'
+_rsync_cmd='rsync --verbose --progress --human-readable --compress --archive --hard-links --one-file-system'
 
 if grep -q 'xattrs' <(rsync --help 2>&1); then
   _rsync_cmd="${_rsync_cmd} --acls --xattrs"
 fi
 
 # macOS and HFS+ Enhancements
-# https://bombich.com/kb/ccc5/credits
-if is-darwin && grep -q 'file-flags' <(rsync --help 2>&1); then
+# http://help.bombich.com/kb/overview/credits#opensource
+if [[ "$OSTYPE" == darwin* ]] && grep -q 'file-flags' <(rsync --help 2>&1); then
   _rsync_cmd="${_rsync_cmd} --crtimes --fileflags --protect-decmpfs --force-change"
 fi
 

modules/utility/init.zsh

@@ -11,9 +11,7 @@
 pmodload 'helper' 'spectrum'
 
 # Correct commands.
-if zstyle -T ':prezto:module:utility' correct; then
-  setopt CORRECT
-fi
+setopt CORRECT
 
 #
 # Aliases
@@ -66,19 +64,16 @@ alias mvi="${aliases[mv]:-mv} -i"
 alias cpi="${aliases[cp]:-cp} -i"
 alias lni="${aliases[ln]:-ln} -i"
 if zstyle -T ':prezto:module:utility' safe-ops; then
-  alias rm="${aliases[rm]:-rm} -i"
-  alias mv="${aliases[mv]:-mv} -i"
-  alias cp="${aliases[cp]:-cp} -i"
-  alias ln="${aliases[ln]:-ln} -i"
+  alias rm='rmi'
+  alias mv='mvi'
+  alias cp='cpi'
+  alias ln='lni'
 fi
 
 # ls
 if is-callable 'dircolors'; then
   # GNU Core Utilities
-
-  if zstyle -T ':prezto:module:utility:ls' dirs-first; then
-    alias ls="${aliases[ls]:-ls} --group-directories-first"
-  fi
+  alias ls='ls --group-directories-first'
 
   if zstyle -t ':prezto:module:utility:ls' color; then
     # Call dircolors to define colors if they're missing
@@ -134,9 +129,9 @@ if zstyle -t ':prezto:module:utility:grep' color; then
 fi
 
 # macOS Everywhere
-if is-darwin; then
+if [[ "$OSTYPE" == darwin* ]]; then
   alias o='open'
-elif is-cygwin; then
+elif [[ "$OSTYPE" == cygwin* ]]; then
   alias o='cygstart'
   alias pbcopy='tee > /dev/clipboard'
   alias pbpaste='cat /dev/clipboard'
@@ -166,7 +161,7 @@ fi
 alias df='df -kh'
 alias du='du -kh'
 
-if is-darwin || is-bsd; then
+if [[ "$OSTYPE" == (darwin*|*bsd*) ]]; then
   alias topc='top -o cpu'
   alias topm='top -o vsize'
 else