fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-29 16:26:39 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

better ffGetPropValue

Browse Source
This commit is contained in:
Linus Dierheimer
2021-05-15 14:58:43 +02:00
parent 2ee2c68db5
commit bbb46e7c66
8 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/locale.c
+1 -1
View File
@@ -28,7 +28,7 @@ void ffPrintLocale(FFinstance* instance)
FFstrbuf locale;
ffStrbufInit(&locale);
ffParsePropFile("/etc/locale.conf", "LANG=", &locale);
ffParsePropFile("/etc/locale.conf", "LANG =", &locale);
if (locale.length == 0)
getLocaleFromEnv(&locale);
src/modules/os.c
+10 -10
View File
@@ -54,16 +54,16 @@ const FFOSResult* ffDetectOS(FFinstance* instance)
// https://www.freedesktop.org/software/systemd/man/os-release.html
while (getline(&line, &len, osRelease) != -1)
{
ffGetPropValue(line, "NAME=", &result.name);
ffGetPropValue(line, "PRETTY_NAME=", &result.prettyName);
ffGetPropValue(line, "ID=", &result.id);
ffGetPropValue(line, "ID_LIKE=", &result.idLike);
ffGetPropValue(line, "VARIANT=", &result.variant);
ffGetPropValue(line, "VARIANT_ID=", &result.variantID);
ffGetPropValue(line, "VERSION=", &result.version);
ffGetPropValue(line, "VERSION_ID=", &result.versionID);
ffGetPropValue(line, "VERSION_CODENAME=", &result.codename);
ffGetPropValue(line, "BUILD_ID=", &result.buildID);
ffGetPropValue(line, "NAME =", &result.name);
ffGetPropValue(line, "PRETTY_NAME =", &result.prettyName);
ffGetPropValue(line, "ID =", &result.id);
ffGetPropValue(line, "ID_LIKE =", &result.idLike);
ffGetPropValue(line, "VARIANT =", &result.variant);
ffGetPropValue(line, "VARIANT_ID =", &result.variantID);
ffGetPropValue(line, "VERSION =", &result.version);
ffGetPropValue(line, "VERSION_ID =", &result.versionID);
ffGetPropValue(line, "VERSION_CODENAME =", &result.codename);
ffGetPropValue(line, "BUILD_ID =", &result.buildID);
}
if(line != NULL)
src/modules/terminalfont.c
+6 -6
View File
@@ -48,7 +48,7 @@ static void printKonsole(FFinstance* instance)
{
FFstrbuf profile;
ffStrbufInit(&profile);
ffParsePropFileConfig(instance, "konsolerc", "DefaultProfile=", &profile);
ffParsePropFileConfig(instance, "konsolerc", "DefaultProfile =", &profile);
if(profile.length == 0)
{
@@ -64,7 +64,7 @@ static void printKonsole(FFinstance* instance)
FFstrbuf font;
ffStrbufInit(&font);
ffParsePropFileHome(instance, profilePath.chars, "Font=", &font);
ffParsePropFileHome(instance, profilePath.chars, "Font =", &font);
if(font.length == 0)
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't find \"Font=%%[^\\n]\" in \"%s\"", profilePath.chars);
@@ -118,7 +118,7 @@ static void printXCFETerminal(FFinstance* instance)
FFstrbuf useSysFont;
ffStrbufInit(&useSysFont);
if(!ffParsePropFileConfig(instance, "xfce4/terminal/terminalrc", "FontUseSystem=", &useSysFont))
if(!ffParsePropFileConfig(instance, "xfce4/terminal/terminalrc", "FontUseSystem =", &useSysFont))
{
ffPrintError(instance, FF_TERMFONT_MODULE_NAME, 0, &instance->config.termFontKey, &instance->config.termFontFormat, FF_TERMFONT_NUM_FORMAT_ARGS, "Couldn't open \"$XDG_CONFIG_HOME/xfce4/terminal/terminalrc\"");
ffStrbufDestroy(&useSysFont);
@@ -127,7 +127,7 @@ static void printXCFETerminal(FFinstance* instance)
if(useSysFont.length == 0 || ffStrbufIgnCaseCompS(&useSysFont, "FALSE") == 0)
{
printTerminalFontFromConfigFile(instance, "xfce4/terminal/terminalrc", "FontName=");
printTerminalFontFromConfigFile(instance, "xfce4/terminal/terminalrc", "FontName =");
ffStrbufDestroy(&useSysFont);
return;
}
@@ -147,7 +147,7 @@ static void printTTY(FFinstance* instance)
FFstrbuf font;
ffStrbufInit(&font);
ffParsePropFile("/etc/vconsole.conf", "Font=", &font);
ffParsePropFile("/etc/vconsole.conf", "Font =", &font);
if(font.length == 0)
{
@@ -178,7 +178,7 @@ void ffPrintTerminalFont(FFinstance* instance)
else if(ffStrbufIgnCaseCompS(&result->exeName, "xfce4-terminal") == 0)
printXCFETerminal(instance);
else if(ffStrbufIgnCaseCompS(&result->exeName, "lxterminal") == 0)
printTerminalFontFromConfigFile(instance, "lxterminal/lxterminal.conf", "fontname=");
printTerminalFontFromConfigFile(instance, "lxterminal/lxterminal.conf", "fontname =");
else if(ffStrbufIgnCaseCompS(&result->exeName, "tilix") == 0)
printTilixTerminal(instance);
else if(ffStrbufStartsWithIgnCaseS(&result->exeName, "/dev/tty"))
src/modules/wmtheme.c
+1 -1
View File
@@ -196,7 +196,7 @@ void ffPrintWMTheme(FFinstance* instance)
}
if(ffStrbufIgnCaseCompS(&result->wmPrettyName, "KWin") == 0 || ffStrbufIgnCaseCompS(&result->wmPrettyName, "KDE") == 0 || ffStrbufIgnCaseCompS(&result->wmPrettyName, "Plasma") == 0)
printWMThemeFromConfigFile(instance, "kwinrc", "theme=", "Breeze");
printWMThemeFromConfigFile(instance, "kwinrc", "theme =", "Breeze");
else if(ffStrbufIgnCaseCompS(&result->wmPrettyName, "Xfwm4") == 0 || ffStrbufIgnCaseCompS(&result->wmPrettyName, "Xfwm") == 0)
printXFWM4(instance);
else if(ffStrbufIgnCaseCompS(&result->wmPrettyName, "Mutter") == 0 || ffStrbufIgnCaseCompS(&result->wmPrettyName, "Gnome") == 0 || ffStrbufIgnCaseCompS(&result->wmPrettyName, "Ubuntu") == 0)