From 6b812230028c6761cc25f10e4c1e328a24925eb8 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 10 Oct 2022 10:16:43 +0200
Subject: [PATCH] Print the last element of the default structure #283

---
 .editorconfig   |  2 +-
 CHANGELOG.md    |  4 ++++
 CMakeLists.txt  |  9 +++++----
 src/fastfetch.c | 20 ++++++++------------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index b2ae4e980..c65cfad7b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -10,7 +10,7 @@ trim_trailing_whitespace = true
 [*.{md,fflogo}]
 trim_trailing_whitespace = false
 
-[*.{txt,fflogo}]
+[*.{fflogo}]
 insert_final_newline = false
 
 [*.yml]
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c2403bb6..ffb90a097 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 1.7.4
+
+The last element in the default structure (currently the color blocks) is now printed again (#283)
+
 # 1.7.3
 
 A lot of small improvements for MacOS & BSD platforms.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61bddf0a9..29614b1fb 100644
--- a/CMakeLists.txt
+++ b/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 1.7.3
+    VERSION 1.7.4
     LANGUAGES C
     DESCRIPTION "Fast system information tool"
     HOMEPAGE_URL "https://github.com/LinusDierheimer/fastfetch"
@@ -155,9 +155,10 @@ endif()
 
 function(fastfetch_load_text FILENAME OUTVAR)
     file(READ "${FILENAME}" TEMP)
-    string(REPLACE "\n" "\\n" TEMP "${TEMP}")
-    string(REPLACE "\"" "\\\"" TEMP "${TEMP}")
-    string(REPLACE "$\\" "" TEMP "${TEMP}")
+    string(REGEX REPLACE "\n$" "" TEMP "${TEMP}") # Remove trailing newline
+    string(REPLACE "\n" "\\n" TEMP "${TEMP}")     # Replace newlines with \n
+    string(REPLACE "\"" "\\\"" TEMP "${TEMP}")    # Replace quotes with \"
+    string(REPLACE "$\\" "" TEMP "${TEMP}")       # Remove $\, so we can unescape some things
     set("${OUTVAR}" "${TEMP}" PARENT_SCOPE)
 endfunction(fastfetch_load_text)
 
diff --git a/src/fastfetch.c b/src/fastfetch.c
index c20bf5ba3..75a6d0a06 100644
--- a/src/fastfetch.c
+++ b/src/fastfetch.c
@@ -769,12 +769,12 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
     }
     else if(strcasecmp(key, "--print-config-system") == 0)
     {
-        fputs(FASTFETCH_DATATEXT_CONFIG_SYSTEM, stdout);
+        puts(FASTFETCH_DATATEXT_CONFIG_SYSTEM);
         exit(0);
     }
     else if(strcasecmp(key, "--print-config-user") == 0)
     {
-        fputs(FASTFETCH_DATATEXT_CONFIG_USER, stdout);
+        puts(FASTFETCH_DATATEXT_CONFIG_USER);
         exit(0);
     }
     else if(strcasecmp(key, "--print-structure") == 0)
@@ -784,7 +784,7 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
     }
     else if(strcasecmp(key, "--list-modules") == 0)
     {
-        fputs(FASTFETCH_DATATEXT_MODULES, stdout);
+        puts(FASTFETCH_DATATEXT_MODULES);
         exit(0);
     }
     else if(strcasecmp(key, "--list-presets") == 0)
@@ -1464,18 +1464,14 @@ int main(int argc, const char** argv)
     if(data.structure.length == 0)
         ffStrbufAppendS(&data.structure, FASTFETCH_DATATEXT_STRUCTURE);
 
-    #define FF_CONTAINS_MODULE_NAME(moduleName)\
-        ffStrbufContainIgnCaseS(&data.structure, ":" #moduleName ":") ||\
-        ffStrbufStartsWithIgnCaseS(&data.structure, #moduleName ":") ||\
-        ffStrbufEndsWithIgnCaseS(&data.structure, ":" #moduleName)
-
-    if(FF_CONTAINS_MODULE_NAME(CPUUsage))
+    if(ffStrbufContainIgnCaseS(&data.structure, "CPUUsage"))
         ffPrepareCPUUsage();
-    if(FF_CONTAINS_MODULE_NAME(PublicIp))
+
+    if(ffStrbufContainIgnCaseS(&data.structure, "PublicIp"))
         ffPreparePublicIp(&instance);
-    if(FF_CONTAINS_MODULE_NAME(Weather))
+
+    if(ffStrbufContainIgnCaseS(&data.structure, "Weather"))
         ffPrepareWeather(&instance);
-    #undef FF_CONTAINS_MODULE_NAME
 
     ffStart(&instance);