From 0f7f915585ed3e4188be7bedf952d62ff42432e9 Mon Sep 17 00:00:00 2001 From: Senya Date: Sun, 30 Aug 2020 23:16:24 +0300 Subject: [PATCH] Make XDG_DATA_DIRS obey the basedir spec --- lib/xdg/base_dir.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/xdg/base_dir.rb b/lib/xdg/base_dir.rb index 2b6800d..ad404e1 100644 --- a/lib/xdg/base_dir.rb +++ b/lib/xdg/base_dir.rb @@ -7,12 +7,11 @@ class BaseDir require 'rbconfig' sysconfdir = ::RbConfig::CONFIG['sysconfdir'] || '/etc' - datadir = ::RbConfig::CONFIG['datadir'] || '/usr/share' # Standard defaults for locations. DEFAULTS = { 'XDG_DATA_HOME' => ['~/.local/share'], - 'XDG_DATA_DIRS' => ['/usr/local/share', datadir], + 'XDG_DATA_DIRS' => ['/usr/local/share', '/usr/share'], 'XDG_CONFIG_HOME' => ['~/.config'], 'XDG_CONFIG_DIRS' => [File.join(sysconfdir,'xdg'), sysconfdir], 'XDG_CACHE_HOME' => ['~/.cache'],