From 8243009d062c0df136b6eb8186109525bb51398c Mon Sep 17 00:00:00 2001 From: Osama Albahrani <54853250+osalbahr@users.noreply.github.com> Date: Sat, 29 Jul 2023 00:41:13 -0400 Subject: [PATCH] config: fallback to ::OS_VERSION In Linux systems where lsb_release is not available by default, `brew config` now falls back to `PRETTY_NAME` (`HOMEBREW_OS_VERSION`). Before: ```console $ brew config HOMEBREW_VERSION: 4.1.2-30-gc346a5c ORIGIN: https://github.com/Homebrew/brew HEAD: c346a5c97adef16fcc439b53cc6e757b64b71cb4 Last commit: 14 hours ago Core tap JSON: 29 Jul 04:16 UTC HOMEBREW_PREFIX: /home/linuxbrew/.linuxbrew HOMEBREW_CASK_OPTS: [] HOMEBREW_DISPLAY: :0 HOMEBREW_EDITOR: /usr/bin/nano HOMEBREW_EVAL_ALL: set HOMEBREW_MAKE_JOBS: 4 Homebrew Ruby: 2.6.10 => /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/2.6.10_1/bin/ruby CPU: quad-core 64-bit skylake Clang: N/A Git: 2.41.0 => /bin/git Curl: 8.2.1 => /bin/curl Kernel: Linux 6.4.4-200.fc38.x86_64 x86_64 GNU/Linux OS: Unknown Host glibc: 2.37 /usr/bin/gcc: 13.1.1 /usr/bin/ruby: N/A glibc: N/A gcc@11: N/A gcc: N/A xorg: N/A ``` After: ```console $ brew config HOMEBREW_VERSION: 4.1.2-30-gc346a5c-dirty ORIGIN: https://github.com/Homebrew/brew HEAD: c346a5c97adef16fcc439b53cc6e757b64b71cb4 Last commit: 14 hours ago Core tap JSON: 29 Jul 04:37 UTC HOMEBREW_PREFIX: /home/linuxbrew/.linuxbrew HOMEBREW_CASK_OPTS: [] HOMEBREW_DISPLAY: :0 HOMEBREW_EDITOR: /usr/bin/nano HOMEBREW_EVAL_ALL: set HOMEBREW_MAKE_JOBS: 4 Homebrew Ruby: 2.6.10 => /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/vendor/portable-ruby/2.6.10_1/bin/ruby CPU: quad-core 64-bit skylake Clang: N/A Git: 2.41.0 => /bin/git Curl: 8.2.1 => /bin/curl Kernel: Linux 6.4.4-200.fc38.x86_64 x86_64 GNU/Linux OS: Arch Linux Host glibc: 2.37 /usr/bin/gcc: 13.1.1 /usr/bin/ruby: N/A glibc: N/A gcc@11: N/A gcc: N/A xorg: N/A ``` --- Library/Homebrew/os/linux.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb index 709dd2d57e..42b03057db 100644 --- a/Library/Homebrew/os/linux.rb +++ b/Library/Homebrew/os/linux.rb @@ -19,6 +19,8 @@ module OS end elsif (redhat_release = Pathname.new("/etc/redhat-release")).readable? redhat_release.read.chomp + elsif ::OS_VERSION and ! ::OS_VERSION.empty? + ::OS_VERSION else "Unknown" end