andreas/mac_os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed CPU detection in favor of architecture detection

Browse Source 
Provides a cleaner and more reliable way to determine what machine
architecture is being used.
This commit is contained in:
Brooke Kuhlmann
2021-02-28 09:10:42 -07:00
parent 6567969919
commit c65f06d5b8
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/utilities.sh
View File

@@ -28,13 +28,6 @@ get_basename() {
} }
export -f get_basename export -f get_basename
# Answers current CPU.
# Parameters: None.
get_cpu() {
printf "%s" "$(system_profiler SPHardwareDataType | awk '/Chip/ {print $3}')"
}
export -f get_cpu
# Answers the file extension. # Answers the file extension.
# Parameters: $1 (required) - The file name. # Parameters: $1 (required) - The file name.
get_extension() { get_extension() {
@@ -52,7 +45,7 @@ export -f get_extension
# Answers Homebrew root path. # Answers Homebrew root path.
# Parameters: None. # Parameters: None.
get_homebrew_root() { get_homebrew_root() {
if [[ -n "$(get_cpu)" ]]; then if [[ "$(/usr/bin/arch)" == "arm64" ]]; then
printf "%s" "/opt/homebrew" printf "%s" "/opt/homebrew"
else else
printf "%s" "/usr/local/Homebrew" printf "%s" "/usr/local/Homebrew"
@@ -63,7 +56,7 @@ export -f get_homebrew_root
# Answers Homebrew binary root path. # Answers Homebrew binary root path.
# Parameters: None. # Parameters: None.
get_homebrew_bin_root() { get_homebrew_bin_root() {
if [[ -n "$(get_cpu)" ]]; then if [[ "$(/usr/bin/arch)" == "arm64" ]]; then
printf "%s" "/opt/homebrew/bin" printf "%s" "/opt/homebrew/bin"
else else
printf "%s" "/usr/local/bin" printf "%s" "/usr/local/bin"