Release: v2.40.4

Regression of v2.40.0

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 2.40.4
+
+Bugfixes:
+* Fix loading presets config on Windows (Windows, #1682)
+    * Regression of v2.40.0
+* Remove the prefix `v` of Hyprland version on Arch Linux (WM, Linux)
+
+# 2.40.3
+
+Bugfixes:
+* Fix loading example configs from presets directory (#1672)
+    * Regression of v2.40.2
+* Mark kitty image protocol support for warp terminal on macOS too (Logo)
+
 # 2.40.2
 
 Changes:

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.40.2
+    VERSION 2.40.4
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"

src/detection/wm/wm_linux.c

@@ -38,6 +38,7 @@ static const char* getHyprland(FFstrbuf* result)
         {
             ffStrbufSubstrAfterFirstC(result, '"');
             ffStrbufSubstrBeforeFirstC(result, '"');
+            ffStrbufTrimLeft(result, 'v');
             FF_DEBUG("Extracted version from version.h: %s", result->chars);
             return NULL;
         }

src/fastfetch.c

@@ -466,38 +466,40 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
 
     if (parseJsoncFile(absolutePath.chars, strictJson)) return;
 
-    if (!ffStrbufContainC(&absolutePath, '/')
-        #ifdef _WIN32
-        && !ffStrbufContainC(&absolutePath, '\\')
-        #endif
-    )
+    //Try to load as a relative path
+
+    FF_LIST_FOR_EACH(FFstrbuf, path, instance.state.platform.dataDirs)
     {
-        //Try to load as a relative path
+        ffStrbufSet(&absolutePath, path);
+        ffStrbufAppendS(&absolutePath, "fastfetch/presets/");
+        ffStrbufAppendS(&absolutePath, value);
+        if (needExtension)
+            ffStrbufAppendS(&absolutePath, ".jsonc");
 
-        FF_LIST_FOR_EACH(FFstrbuf, path, instance.state.platform.dataDirs)
-        {
-            ffStrbufSet(&absolutePath, path);
-            ffStrbufAppendS(&absolutePath, "fastfetch/presets/");
-            ffStrbufAppendS(&absolutePath, value);
-            if (needExtension)
-                ffStrbufAppendS(&absolutePath, ".jsonc");
+        if (parseJsoncFile(absolutePath.chars, strictJson)) return;
+    }
 
-            if (parseJsoncFile(absolutePath.chars, strictJson)) return;
-        }
+    //Try to load as a relative path with the directory of fastfetch binary
 
-        //Try to load as a relative path with the directory of fastfetch binary
+    if (instance.state.platform.exePath.length)
+    {
+        uint32_t lastSlash = ffStrbufLastIndexC(&instance.state.platform.exePath, '/') + 1;
+        assert(lastSlash < instance.state.platform.exePath.length);
 
-        if (instance.state.platform.exePath.length)
-        {
-            ffStrbufSet(&absolutePath, &instance.state.platform.exePath);
-            ffStrbufSubstrBeforeLastC(&absolutePath, '/');
-            ffStrbufAppendS(&absolutePath, "/");
-            ffStrbufAppendS(&absolutePath, value);
-            if (needExtension)
-                ffStrbufAppendS(&absolutePath, ".jsonc");
+        // Try {exePath}/
+        ffStrbufSetNS(&absolutePath, lastSlash, instance.state.platform.exePath.chars);
+        ffStrbufAppendS(&absolutePath, value);
+        if (needExtension)
+            ffStrbufAppendS(&absolutePath, ".jsonc");
+        if (parseJsoncFile(absolutePath.chars, strictJson)) return;
 
-            if (parseJsoncFile(absolutePath.chars, strictJson)) return;
-        }
+        // Try {exePath}/presets/
+        ffStrbufSubstrBefore(&absolutePath, lastSlash);
+        ffStrbufAppendS(&absolutePath, "presets/");
+        ffStrbufAppendS(&absolutePath, value);
+        if (needExtension)
+            ffStrbufAppendS(&absolutePath, ".jsonc");
+        if (parseJsoncFile(absolutePath.chars, strictJson)) return;
     }
 
     //File not found

src/logo/logo.c

@@ -627,7 +627,12 @@ void ffLogoPrint(void)
         ffStrbufIgnCaseEqualS(&terminal->processName, "wezterm") ||
         ffStrbufIgnCaseEqualS(&terminal->processName, "wayst") ||
         ffStrbufIgnCaseEqualS(&terminal->processName, "ghostty") ||
-        ffStrbufIgnCaseEqualS(&terminal->processName, "warp");
+        #ifdef __APPLE__
+        ffStrbufIgnCaseEqualS(&terminal->processName, "WarpTerminal") ||
+        #else
+        ffStrbufIgnCaseEqualS(&terminal->processName, "warp") ||
+        #endif
+        false;
 
     //Try to load the logo as an image. If it succeeds, print it and return.
     if(logoPrintImageIfExists(supportsKitty ? FF_LOGO_TYPE_IMAGE_KITTY : FF_LOGO_TYPE_IMAGE_CHAFA, false))

src/util/platform/FFPlatform_unix.c

@@ -172,14 +172,6 @@ static void getDataDirs(FFPlatform* platform)
 #endif
     ffPlatformPathAddAbsolute(&platform->dataDirs, FASTFETCH_TARGET_DIR_USR "/local/share/");
     ffPlatformPathAddAbsolute(&platform->dataDirs, FASTFETCH_TARGET_DIR_USR "/share/");
-
-    if (platform->exePath.length > 0)
-    {
-        // Add ${currentExePath}
-        FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateCopy(&platform->exePath);
-        ffStrbufSubstrBeforeLastC(&path, '/');
-        ffPlatformPathAddAbsolute(&platform->dataDirs, path.chars);
-    }
 }
 
 static void getUserName(FFPlatform* platform, const struct passwd* pwd)

src/util/platform/FFPlatform_windows.c

@@ -129,14 +129,6 @@ static void getDataDirs(FFPlatform* platform)
     platformPathAddKnownFolder(&platform->dataDirs, &FOLDERID_RoamingAppData);
     platformPathAddKnownFolder(&platform->dataDirs, &FOLDERID_LocalAppData);
     ffPlatformPathAddHome(&platform->dataDirs, platform, "");
-
-    if (platform->exePath.length > 0)
-    {
-        // Add ${currentExePath}
-        FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateCopy(&platform->exePath);
-        ffStrbufSubstrBeforeLastC(&path, '/');
-        ffPlatformPathAddAbsolute(&platform->dataDirs, path.chars);
-    }
 }
 
 static void getUserName(FFPlatform* platform)