From 42960c3e74b214e0bdc25be58798a921cf08c043 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Wed, 25 Jan 2023 17:23:44 +0900 Subject: [PATCH] repair if condition --- Library/Homebrew/extend/os/default_prefix.rb | 6 ++---- .../Homebrew/extend/os/mac/default_prefix.rb | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/extend/os/default_prefix.rb b/Library/Homebrew/extend/os/default_prefix.rb index 80781b8c8d..01051c964c 100644 --- a/Library/Homebrew/extend/os/default_prefix.rb +++ b/Library/Homebrew/extend/os/default_prefix.rb @@ -1,10 +1,8 @@ # typed: true # frozen_string_literal: true -require "simulate_system" - -if OS.mac? && Hardware::CPU.arm? +if OS.mac? require "extend/os/mac/default_prefix" -elsif Homebrew::SimulateSystem.simulating_or_running_on_linux? +elsif OS.linux? require "extend/os/linux/default_prefix" end diff --git a/Library/Homebrew/extend/os/mac/default_prefix.rb b/Library/Homebrew/extend/os/mac/default_prefix.rb index 0d9ea48c13..330e326598 100644 --- a/Library/Homebrew/extend/os/mac/default_prefix.rb +++ b/Library/Homebrew/extend/os/mac/default_prefix.rb @@ -1,10 +1,17 @@ # typed: true # frozen_string_literal: true -module Homebrew - remove_const(:DEFAULT_PREFIX) - DEFAULT_PREFIX = HOMEBREW_MACOS_ARM_DEFAULT_PREFIX +require "simulate_system" - remove_const(:DEFAULT_REPOSITORY) - DEFAULT_REPOSITORY = HOMEBREW_MACOS_ARM_DEFAULT_REPOSITORY +module Homebrew + if Hardware::CPU.arm? || Homebrew::SimulateSystem.simulating_or_running_on_linux? + remove_const(:DEFAULT_PREFIX) + remove_const(:DEFAULT_REPOSITORY) + + DEFAULT_PREFIX, DEFAULT_REPOSITORY = if Hardware::CPU.arm? + [HOMEBREW_MACOS_ARM_DEFAULT_PREFIX, HOMEBREW_MACOS_ARM_DEFAULT_REPOSITORY] + elsif Homebrew::SimulateSystem.simulating_or_running_on_linux? + [HOMEBREW_LINUX_DEFAULT_PREFIX, HOMEBREW_LINUX_DEFAULT_REPOSITORY] + end + end end