Renaming references from osx to macos (#340)

cli/.internal/all.sh

@@ -13,7 +13,7 @@ source "${library_path}/github.sh"
 source "${library_path}/logging.sh"
 source "${library_path}/network.sh"
 source "${library_path}/os.sh"
-source "${library_path}/osx.sh"
+source "${library_path}/macos.sh"
 source "${library_path}/repl.sh"
 source "${library_path}/requirements.sh"
 source "${library_path}/sphynx.sh"

cli/.internal/library/general.sh

@@ -5,7 +5,7 @@ function sx::uuid() {
 
   local -r id="$(uuidgen)"
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     sx::log::info "${id}"
   else
     sx::log::info "${id^^}"

cli/.internal/library/osx.sh → cli/.internal/library/macos.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-function sx::osx::airport() {
-  if sx::os::is_osx; then
+function sx::macos::airport() {
+  if sx::os::is_macos; then
     '/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Resources/airport' "${@}"
   else
     sx::log::fatal 'The airport command is not available in your OS'
@@ -10,7 +10,7 @@ function sx::osx::airport() {
 
 # References:
 # - http://blog.macromates.com/2006/keychain-access-from-shell
-function sx::osx::keychain_pass() {
+function sx::macos::keychain_pass() {
   local -r account="${1:-}"
 
   if [ -z "${account:-}" ]; then
@@ -33,8 +33,8 @@ function sx::osx::keychain_pass() {
   echo "${password}"
 }
 
-function sx::osx::default_browser_application() {
-  if sx::os::is_osx; then
+function sx::macos::default_browser_application() {
+  if sx::os::is_macos; then
     local -r browser_id="$(
       defaults read com.apple.LaunchServices/com.apple.launchservices.secure LSHandlers \
         | grep 'LSHandlerURLScheme = https;' -B1 \

cli/.internal/library/network.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 function sx::network::current::ssid() {
-  if sx::os::is_osx; then
-    sx::osx::airport -I en1 | grep -i SSID | tail -n 1 | sed 's/SSID://g' | sed 's/ //g'
+  if sx::os::is_macos; then
+    sx::macos::airport -I en1 | grep -i SSID | tail -n 1 | sed 's/SSID://g' | sed 's/ //g'
   else
     nmcli -t -f active,ssid dev wifi | grep -E '^yes' | cut -d ':' -f2
   fi

cli/.internal/library/os.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-function sx::os::is_osx() {
+function sx::os::is_macos() {
   [ "$(uname)" = 'Darwin' ]
 }
 
@@ -54,8 +54,8 @@ function sx::os::browser::open() {
         return 0
       fi
     done
-  elif sx::os::is_osx; then
-    local -r browser_application="$(sx::osx::default_browser_application)"
+  elif sx::os::is_macos; then
+    local -r browser_application="$(sx::macos::default_browser_application)"
     if [ -n "${browser_application}" ]; then
       open -a "${browser_application}" "${*}"
       return 0

cli/.internal/library/requirements.sh

@@ -37,14 +37,14 @@ function sx::require_linux() {
   fi
 }
 
-function sx::require_osx() {
-  if ! sx::os::is_osx; then
+function sx::require_macos() {
+  if ! sx::os::is_macos; then
     sx::log::fatal 'You are not running on a MacOS machine'
   fi
 }
 
 function sx::require_supported_os() {
-  if ! sx::os::is_osx && ! sx::os::is_linux; then
+  if ! sx::os::is_macos && ! sx::os::is_linux; then
     sx::log::fatal 'You are not running on a supported OS'
   fi
 }

cli/browser/core/kill-tabs.sh

@@ -3,7 +3,7 @@
 # Kill all the tabs in Chrome to free up memory
 # [C] explained: http://www.commandlinefu.com/commands/view/402/exclude-grep-from-your-grepped-output-of-ps-alias-included-in-description
 function sx::browser::kill_tabs::chrome() {
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     local -r output="$(pgrep \
       -ifl \
       '[C]hrome.*--type=renderer')"
@@ -24,7 +24,7 @@ function sx::browser::kill_tabs::chrome() {
 }
 
 function sx::browser::kill_tabs::firefox() {
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     local -r output="$(pgrep \
       -ifl \
       '[F]irefox.*-isForBrowser')"

cli/shell/core/benchmark.sh

@@ -5,7 +5,7 @@ function sx::shell::run_tests() {
 
   local -r sh="${1}"
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     sw_vers
     echo
   fi

cli/system/core/clear-trash.sh

@@ -3,7 +3,7 @@
 function sx::system::clear_trash() {
   sx::require_supported_os
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     sx::require 'sqlite3'
 
     for log_file in /private/var/log/asl/*.asl; do

cli/system/core/dns.sh

@@ -3,7 +3,7 @@
 function sx::system::flush_cache() {
   sx::require_supported_os
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     sudo dscacheutil -flushcache
     sudo killall -HUP mDNSResponder mDNSResponderHelper
   else

cli/system/core/ip.sh

@@ -38,7 +38,7 @@ function sx::system::ip::public() {
 function sx::system::ip::gateway() {
   sx::require_supported_os
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     netstat -rn | grep 'default' | head -n 1 | awk '{ print $2 }'
   else
     ip route | grep 'default' | awk '{ print $3 }'

cli/workstation/core/setup.sh

@@ -6,7 +6,7 @@ function sx::workstation::setup() {
 
   export ANSIBLE_CONFIG="${SPHYNX_DIR}/playbooks"
 
-  if sx::os::is_osx; then
+  if sx::os::is_macos; then
     local -r playbook_path="${ANSIBLE_CONFIG}/macos/main.yml"
   else
     local -r playbook_path="${ANSIBLE_CONFIG}/linux/main.yml"