napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Improve XDG handling

Browse Source 
- When environment is empty, use default values from spec
 - Search in application-named subdirs first (but keep previous
   behavior of also searching directly in the named dirs)
 - Don't consider empty XDG_* elements
 - Settings XDG_DATA_DIRS=":" would yield an empty list of extra
   directories to check; don't bother setting haveExtraDirs for that.
This commit is contained in:
Adriaan de Groot 2019-04-02 09:57:28 -04:00
parent ce07babcee
commit caba74438e
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -99,21 +99,32 @@ setAppDataDir( const QDir& dir )
/* Split $ENV{@p name} on :, append to @p l, making sure each ends in / */
static void
mungeEnvironment( QStringList& l, const char *name )
mungeEnvironment( QStringList& l, const char* name, const char* defaultDirs )
{
for ( auto s : QString( qgetenv( name ) ).split(':') )
static const QString calamaresSubdir = QStringLiteral( "calamares/" );
QStringList dirs = QString( qgetenv( name ) ).split( ':' );
if ( dirs.isEmpty() )
dirs = QString( defaultDirs ).split( ':' );
for ( auto s : dirs )
{
if ( s.isEmpty() )
continue;
if ( s.endsWith( '/' ) )
l << s;
l << ( s + calamaresSubdir ) << s;
else
l << ( s + '/' );
l << ( s + '/' + calamaresSubdir ) << ( s + '/' );
}
}
void
setXdgDirs()
{
s_haveExtraDirs = true;
mungeEnvironment( s_extraConfigDirs, "XDG_CONFIG_DIRS" );
mungeEnvironment( s_extraDataDirs, "XDG_DATA_DIRS" );
mungeEnvironment( s_extraConfigDirs, "XDG_CONFIG_DIRS", "/etc/xdg" );
mungeEnvironment( s_extraDataDirs, "XDG_DATA_DIRS", "/usr/local/share/:/usr/share/" );
s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() );
}
QStringList