From 1f7c6ab70c74be3a44670555e3314316921c6dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Thu, 24 Aug 2023 14:36:32 +0800 Subject: [PATCH] Fastfetch: add `--config` --- CHANGELOG.md | 2 ++ src/data/help.txt | 1 + src/fastfetch.c | 6 +++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7faca3eb8..c5d22ace9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ Bugfixes: * Fix typo in config parsing for --color-title (#534) * Fix percent formatting for `--*-format` (#535) +* Fix loading presets for homebrew (macOS) Features: * Add option `--percent-ndigits` +* Add command flag `--config` as an alias of `--load-config` # 2.0.2 diff --git a/src/data/help.txt b/src/data/help.txt index f8fff7be1..48a076e88 100644 --- a/src/data/help.txt +++ b/src/data/help.txt @@ -19,6 +19,7 @@ Informative options: General options: --load-config : Load a config file or preset (+) + --config : Alias of --load-config (+) --multithreading : Use multiple threads to detect values --stat : Show time usage (in ms) for individual modules --allow-slow-operations : Allow operations that are usually very slow for more detailed output diff --git a/src/fastfetch.c b/src/fastfetch.c index 118146d16..fd13f7862 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -58,11 +58,11 @@ static inline void printCommandHelp(const char* command) { if(command == NULL) puts(FASTFETCH_DATATEXT_HELP); - else if(ffStrEqualsIgnCase(command, "c") || ffStrEqualsIgnCase(command, "color")) + else if(ffStrEqualsIgnCase(command, "color")) puts(FASTFETCH_DATATEXT_HELP_COLOR); else if(ffStrEqualsIgnCase(command, "format")) puts(FASTFETCH_DATATEXT_HELP_FORMAT); - else if(ffStrEqualsIgnCase(command, "load-config") || ffStrEqualsIgnCase(command, "loadconfig") || ffStrEqualsIgnCase(command, "config")) + else if(ffStrEqualsIgnCase(command, "load-config") || ffStrEqualsIgnCase(command, "config")) puts(FASTFETCH_DATATEXT_HELP_CONFIG); else if(ffStrEqualsIgnCase(command, "os-format")) { @@ -945,7 +945,7 @@ static void parseOption(FFdata* data, const char* key, const char* value) //General options// /////////////////// - else if(ffStrEqualsIgnCase(key, "--load-config")) + else if(ffStrEqualsIgnCase(key, "--load-config") || ffStrEqualsIgnCase(key, "--config")) optionParseConfigFile(data, key, value); else if(ffStrEqualsIgnCase(key, "--gen-config")) generateConfigFile(false, value);