Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2589 from psychon/theme_path 

Make beautiful.theme_path actually work again
This commit is contained in:
mergify[bot] 2019-01-14 13:06:25 +00:00 committed by GitHub
parent 708e522d56 3145272292
commit 86ab272045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/beautiful/init.lua
View File

@ -194,9 +194,10 @@ function beautiful.init(config)
-- Expand the '~' $HOME shortcut -- Expand the '~' $HOME shortcut
config = config:gsub("^~/", homedir .. "/") config = config:gsub("^~/", homedir .. "/")
local dir = Gio.File.new_for_path(config):get_parent() local dir = Gio.File.new_for_path(config):get_parent()
beautiful.theme_path = dir and (dir:get_path().."/") or nil rawset(beautiful, "theme_path", dir and (dir:get_path().."/") or nil)
theme = protected_call(dofile, config) theme = protected_call(dofile, config)
elseif type(config) == 'table' then elseif type(config) == 'table' then
rawset(beautiful, "theme_path", nil)
theme = config theme = config
end end