diff options
author | Ken Moore <moorekou@gmail.com> | 2016-07-18 12:22:03 -0400 |
---|---|---|
committer | Ken Moore <moorekou@gmail.com> | 2016-07-18 12:22:03 -0400 |
commit | aea34502477f83472dde87261bee5f563e1fb0b8 (patch) | |
tree | 9e727b2e498a0a18ef147bda9d22e97cf280223e /src-qt5/core | |
parent | Don't embed the fluxbox config files into the lumina-desktop binary (using th... (diff) | |
download | lumina-aea34502477f83472dde87261bee5f563e1fb0b8.tar.gz lumina-aea34502477f83472dde87261bee5f563e1fb0b8.tar.bz2 lumina-aea34502477f83472dde87261bee5f563e1fb0b8.zip |
Also ensure that the XDG_CONFIG_HOME replacement happens on the fluxbox-init file as well.
Diffstat (limited to 'src-qt5/core')
-rw-r--r-- | src-qt5/core/lumina-session/session.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp index ec7a4e69..a2abc044 100644 --- a/src-qt5/core/lumina-session/session.cpp +++ b/src-qt5/core/lumina-session/session.cpp @@ -73,9 +73,11 @@ void LSession::start(){ QString confDir = QString( getenv("XDG_CONFIG_HOME"))+"/lumina-desktop"; if(!QFile::exists(confDir)){ QDir dir(confDir); dir.mkpath(confDir); } if(!QFile::exists(confDir+"/fluxbox-init")){ - QFile::copy(LOS::LuminaShare()+"/fluxbox-init-rc",confDir+"/fluxbox-init"); + QStringList keys = LUtils::readFile(LOS::LuminaShare()+"/fluxbox-init-rc"); + keys = keys.replaceInStrings("${XDG_CONFIG_HOME}", QString( getenv("XDG_CONFIG_HOME"))); + LUtils::writeFile(confDir+"/fluxbox-init", keys, true); QFile::setPermissions(confDir+"/fluxbox-init", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); - } + } if(!QFile::exists(confDir+"/fluxbox-keys")){ QStringList keys = LUtils::readFile(LOS::LuminaShare()+"/fluxbox-keys"); keys = keys.replaceInStrings("${XDG_CONFIG_HOME}", QString( getenv("XDG_CONFIG_HOME"))); |