Merge pull request #17947 from gromgit/diagnostic/xdg-data-dirs

Homebrew · Aug 5, 2024 · a8e6262 · a8e6262
2 parents 1e56012 + 3eaebdc
commit a8e6262
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Library/Homebrew/extend/os/linux/diagnostic.rb b/Library/Homebrew/extend/os/linux/diagnostic.rb
@@ -60,8 +60,8 @@ def check_tmpdir_executable
       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
@@ -185,6 +185,7 @@ USED_BY_HOMEBREW_VARS=(
   SUDO_USER
   TMUX
   XDG_CACHE_HOME
+  XDG_DATA_DIRS
   XDG_RUNTIME_DIR
   ZDOTDIR
 )