From e2f0075ee865f28750edce6a0e055a4af5154175 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:02:24 +0900 Subject: [PATCH 1/4] move default_prefix to extend/os --- Library/Homebrew/default_prefix.rb | 12 ++---------- Library/Homebrew/extend/os/default_prefix.rb | 10 ++++++++++ Library/Homebrew/extend/os/linux/default_prefix.rb | 7 +++++++ Library/Homebrew/extend/os/mac/default_prefix.rb | 7 +++++++ 4 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 Library/Homebrew/extend/os/default_prefix.rb create mode 100644 Library/Homebrew/extend/os/linux/default_prefix.rb create mode 100644 Library/Homebrew/extend/os/mac/default_prefix.rb diff --git a/Library/Homebrew/default_prefix.rb b/Library/Homebrew/default_prefix.rb index de132865d9..49917cdd16 100644 --- a/Library/Homebrew/default_prefix.rb +++ b/Library/Homebrew/default_prefix.rb @@ -1,15 +1,7 @@ # typed: true # frozen_string_literal: true -require "simulate_system" - module Homebrew - # TODO: Refactor and move to extend/os - DEFAULT_PREFIX, DEFAULT_REPOSITORY = if OS.mac? && Hardware::CPU.arm? # rubocop:disable Homebrew/MoveToExtendOS - [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] - else - [HOMEBREW_DEFAULT_PREFIX, HOMEBREW_DEFAULT_REPOSITORY] - end.freeze + DEFAULT_PREFIX = HOMEBREW_DEFAULT_PREFIX + DEFAULT_REPOSITORY = HOMEBREW_DEFAULT_REPOSITORY end diff --git a/Library/Homebrew/extend/os/default_prefix.rb b/Library/Homebrew/extend/os/default_prefix.rb new file mode 100644 index 0000000000..80781b8c8d --- /dev/null +++ b/Library/Homebrew/extend/os/default_prefix.rb @@ -0,0 +1,10 @@ +# typed: true +# frozen_string_literal: true + +require "simulate_system" + +if OS.mac? && Hardware::CPU.arm? + require "extend/os/mac/default_prefix" +elsif Homebrew::SimulateSystem.simulating_or_running_on_linux? + require "extend/os/linux/default_prefix" +end diff --git a/Library/Homebrew/extend/os/linux/default_prefix.rb b/Library/Homebrew/extend/os/linux/default_prefix.rb new file mode 100644 index 0000000000..c0cbd4cc05 --- /dev/null +++ b/Library/Homebrew/extend/os/linux/default_prefix.rb @@ -0,0 +1,7 @@ +# typed: true +# frozen_string_literal: true + +module Homebrew + DEFAULT_PREFIX = HOMEBREW_LINUX_DEFAULT_PREFIX + DEFAULT_REPOSITORY = HOMEBREW_LINUX_DEFAULT_REPOSITORY +end diff --git a/Library/Homebrew/extend/os/mac/default_prefix.rb b/Library/Homebrew/extend/os/mac/default_prefix.rb new file mode 100644 index 0000000000..559064c1f0 --- /dev/null +++ b/Library/Homebrew/extend/os/mac/default_prefix.rb @@ -0,0 +1,7 @@ +# typed: true +# frozen_string_literal: true + +module Homebrew + DEFAULT_PREFIX = HOMEBREW_MACOS_ARM_DEFAULT_PREFIX + DEFAULT_REPOSITORY = HOMEBREW_MACOS_ARM_DEFAULT_REPOSITORY +end From 97bba59e730968fe211db4ef14b748f9e5c9d891 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:45:18 +0900 Subject: [PATCH 2/4] add require extend/os --- Library/Homebrew/default_prefix.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/default_prefix.rb b/Library/Homebrew/default_prefix.rb index 49917cdd16..81c85ebcaa 100644 --- a/Library/Homebrew/default_prefix.rb +++ b/Library/Homebrew/default_prefix.rb @@ -5,3 +5,5 @@ module Homebrew DEFAULT_PREFIX = HOMEBREW_DEFAULT_PREFIX DEFAULT_REPOSITORY = HOMEBREW_DEFAULT_REPOSITORY end + +require "extend/os/default_prefix" From 82890894828db0b379e740b16d10512f53721584 Mon Sep 17 00:00:00 2001 From: hyuraku <32809703+hyuraku@users.noreply.github.com> Date: Tue, 24 Jan 2023 21:57:39 +0900 Subject: [PATCH 3/4] add remove_const to cancel warning --- Library/Homebrew/extend/os/linux/default_prefix.rb | 3 +++ Library/Homebrew/extend/os/mac/default_prefix.rb | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Library/Homebrew/extend/os/linux/default_prefix.rb b/Library/Homebrew/extend/os/linux/default_prefix.rb index c0cbd4cc05..d72987236a 100644 --- a/Library/Homebrew/extend/os/linux/default_prefix.rb +++ b/Library/Homebrew/extend/os/linux/default_prefix.rb @@ -2,6 +2,9 @@ # frozen_string_literal: true module Homebrew + remove_const(:DEFAULT_PREFIX) DEFAULT_PREFIX = HOMEBREW_LINUX_DEFAULT_PREFIX + + remove_const(:DEFAULT_REPOSITORY) DEFAULT_REPOSITORY = HOMEBREW_LINUX_DEFAULT_REPOSITORY end diff --git a/Library/Homebrew/extend/os/mac/default_prefix.rb b/Library/Homebrew/extend/os/mac/default_prefix.rb index 559064c1f0..0d9ea48c13 100644 --- a/Library/Homebrew/extend/os/mac/default_prefix.rb +++ b/Library/Homebrew/extend/os/mac/default_prefix.rb @@ -2,6 +2,9 @@ # frozen_string_literal: true module Homebrew + remove_const(:DEFAULT_PREFIX) DEFAULT_PREFIX = HOMEBREW_MACOS_ARM_DEFAULT_PREFIX + + remove_const(:DEFAULT_REPOSITORY) DEFAULT_REPOSITORY = HOMEBREW_MACOS_ARM_DEFAULT_REPOSITORY end 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 4/4] 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