misc: fix macos build

Author: Toni500github

CMakeLists.txt

@@ -43,23 +43,23 @@ execute_process(COMMAND ./scripts/generateVersion.sh
                 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 # https://github.com/libcpr/cpr/blob/5f475522597b8f3721e2440daddeced7a969f24c/CMakeLists.txt#L39
-macro(add_option OPTION_NAME OPTION_TEXT OPTION_DEFAULT)
+macro(add_option OPTION_NAME OPTION_TEXT OPTION_DEFAULT DEFINE_OPTION)
     option(${OPTION_NAME} ${OPTION_TEXT} ${OPTION_DEFAULT})
     if(DEFINED ENV{${OPTION_NAME}})
         # Allow overriding the option through an environment variable
         set(${OPTION_NAME} $ENV{${OPTION_NAME}})
     endif()
-    if(${OPTION_NAME})
+    if(${OPTION_NAME} AND DEFINE_OPTION)
         add_definitions(-D${OPTION_NAME})
     endif()
     message(STATUS "  ${OPTION_NAME}: ${${OPTION_NAME}}")
 endmacro()
 
 message(STATUS "Set flags:")
 message(STATUS "=================")
-add_option(GUI_APP "Build GTK3 application" 0)
-add_option(USE_DCONF "Compile customfetch with dconf support" 1)
-add_option(VARS "Add additional flags at CXXFLAGS" "")
+add_option(GUI_APP "Build GTK3 application" 0 1)
+add_option(USE_DCONF "Compile customfetch with dconf support" 1 0)
+add_option(VARS "Add additional flags at CXXFLAGS" "" 1)
 message(STATUS "=================")
 
 if(GUI_APP)
@@ -135,6 +135,8 @@ add_library(cufetch SHARED
     libcufetch/config.cc
     libcufetch/cufetch.cc
     libcufetch/parse.cc
+    src/libs/toml++/toml.cpp
+    src/util.cpp
 )
 
 set_target_properties(cufetch PROPERTIES
@@ -144,6 +146,7 @@ set_target_properties(cufetch PROPERTIES
     POSITION_INDEPENDENT_CODE ON
 )
 
+target_link_libraries(cufetch PUBLIC tiny-process-library)
 target_link_libraries(cufetch PUBLIC fmt)
 target_link_libraries(${TARGET_NAME} PUBLIC cufetch)
 

include/texts.hpp

@@ -176,9 +176,9 @@ Tag References:
 
 3. Conditional Tag ($[])
     Displays different outputs based on conditions.
-    
+
     Syntax: $[condition,comparison,true_output,false_output]
-    
+
     Examples:
     - $[$<user.name>,toni,Welcome back!,Access denied]
     - $[$(date +%m-%d),12-25,Merry Christmas!,]
@@ -271,7 +271,9 @@ layout = [
     "${auto}OS: $<os.name> $<system.arch>",
     "${auto}Host: $<system.host>",
     "${auto}Kernel: $<os.kernel>",
-    "${auto}Uptime: $<os.uptime>",)#"
+    "${auto}Uptime: $<os.uptime>",
+    "${auto}Terminal: $<user.terminal>",
+    "${auto}Shell: $<user.shell>",)#"
 #if !CF_ANDROID
                                                R"#(
     "${auto}Theme: $<theme.gtk.all.name>",

src/core-modules/macos/system.cc

@@ -152,7 +152,7 @@ const std::string get_host_from_family(const std::string_view host_family)
     }
     else if (hasStart(host_family, "MacPro"))
     {
-        const std::string_view version = host_family.substr("MacPro"_leMac Pro(2019) n);
+        const std::string_view version = host_family.substr("MacPro"_len);
         switch (fnv1a16::hash(version.data()))
         {
             case "7,1"_fnv1a16: return "Mac Pro (2019)";