From a7a96a8954b7cb10f8e73bb04bc2506dadc82028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Sun, 19 Nov 2023 11:15:06 +0800 Subject: [PATCH] Fastfetch: remove config-system & config-user --- src/fastfetch.c | 8 ++------ src/fastfetch_datatext.h.in | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/fastfetch.c b/src/fastfetch.c index f0fc0b574..5d31a7de1 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -129,7 +129,7 @@ static void printCommandHelp(const char* command) puts(FASTFETCH_DATATEXT_HELP_COLOR); else if(ffStrEqualsIgnCase(command, "format")) puts(FASTFETCH_DATATEXT_HELP_FORMAT); - else if(ffStrEqualsIgnCase(command, "load-config") || ffStrEqualsIgnCase(command, "config")) + else if(ffStrEqualsIgnCase(command, "config")) puts(FASTFETCH_DATATEXT_HELP_CONFIG); else if(isalpha(command[0]) && ffStrEndsWithIgnCase(command, "-format")) // x-format printCommandFormatHelp(command); @@ -445,11 +445,7 @@ static void parseCommand(FFdata* data, char* key, char* value) else if(ffStrStartsWithIgnCase(key, "--print-")) { const char* subkey = key + strlen("--print-"); - if(ffStrEqualsIgnCase(subkey, "config-system")) - puts(FASTFETCH_DATATEXT_CONFIG_SYSTEM); - else if(ffStrEqualsIgnCase(subkey, "config-user")) - puts(FASTFETCH_DATATEXT_CONFIG_USER); - else if(ffStrEqualsIgnCase(subkey, "structure")) + if(ffStrEndsWithIgnCase(subkey, "structure")) puts(FASTFETCH_DATATEXT_STRUCTURE); else if(ffStrEqualsIgnCase(subkey, "logos")) ffLogoBuiltinPrint(); diff --git a/src/fastfetch_datatext.h.in b/src/fastfetch_datatext.h.in index 19a532885..2e4604c28 100644 --- a/src/fastfetch_datatext.h.in +++ b/src/fastfetch_datatext.h.in @@ -4,9 +4,6 @@ #define FASTFETCH_INDLUDED_fastfetch_datatext_h_in #define FASTFETCH_DATATEXT_STRUCTURE "@DATATEXT_STRUCTURE@" -#define FASTFETCH_DATATEXT_CONFIG_SYSTEM "@DATATEXT_CONFIG_SYSTEM@" -#define FASTFETCH_DATATEXT_CONFIG_USER "@DATATEXT_CONFIG_USER@" //Requires FASTFETCH_PROJECT_VERSION and FASTFETCH_DATATEXT_STRUCTURE to be set -#define FASTFETCH_DATATEXT_CONFIG_USER_JSONC "@DATATEXT_CONFIG_USER_JSONC@" #define FASTFETCH_DATATEXT_HELP "@DATATEXT_HELP@" #define FASTFETCH_DATATEXT_HELP_COLOR "@DATATEXT_HELP_COLOR@" #define FASTFETCH_DATATEXT_HELP_FORMAT "@DATATEXT_HELP_FORMAT@"