From 3eaebdc9d8b8ddd5cefafd1a0ec786050e04c52f Mon Sep 17 00:00:00 2001 From: Adrian Ho Date: Sat, 3 Aug 2024 11:29:04 +0800 Subject: [PATCH] diagnostic: fix XDG_DATA_DIRS check Pass `XDG_DATA_DIRS` through `bin/brew` so that it can be checked. --- Library/Homebrew/extend/os/linux/diagnostic.rb | 4 ++-- bin/brew | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/extend/os/linux/diagnostic.rb b/Library/Homebrew/extend/os/linux/diagnostic.rb index fea32b3893..234808224e 100644 --- a/Library/Homebrew/extend/os/linux/diagnostic.rb +++ b/Library/Homebrew/extend/os/linux/diagnostic.rb @@ -60,8 +60,8 @@ module Homebrew end def check_xdg_data_dirs - xdg_data_dirs = ENV.fetch("XDG_DATA_DIRS", nil) - return if xdg_data_dirs.blank? || xdg_data_dirs.split("/").include?(HOMEBREW_PREFIX/"share") + xdg_data_dirs = ENV.fetch("HOMEBREW_XDG_DATA_DIRS", nil) + return if xdg_data_dirs.blank? || xdg_data_dirs.split(":").include?(HOMEBREW_PREFIX/"share") <<~EOS Homebrew's share was not found in your XDG_DATA_DIRS but you have diff --git a/bin/brew b/bin/brew index 706c6c615b..a4b06170b7 100755 --- a/bin/brew +++ b/bin/brew @@ -185,6 +185,7 @@ USED_BY_HOMEBREW_VARS=( SUDO_USER TMUX XDG_CACHE_HOME + XDG_DATA_DIRS XDG_RUNTIME_DIR ZDOTDIR )