From 4e349aa5832a22709fd9e69c9505560a04de7bd6 Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Mon, 19 Aug 2024 11:28:51 +0800 Subject: [PATCH] Stick to standard `--version` --- include/chsrc.h | 2 +- src/chsrc.c | 23 +++++++++++++++-------- src/recipe/os/APT/common.h | 8 ++++---- src/recipe/ware/Homebrew.c | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/include/chsrc.h b/include/chsrc.h index 53b8324..cb7525a 100644 --- a/include/chsrc.h +++ b/include/chsrc.h @@ -364,7 +364,7 @@ test_speed_url (const char *url) char *curl_cmd = xy_strjoin (7, "curl -qsL ", ipv6, " -o " xy_os_devnull, " -w \"%{http_code} %{speed_download}\" -m", time_sec, - " -A chsrc/" Chsrc_Version " ", url); + " -A chsrc/" Chsrc_Banner_Version " ", url); // chsrc_info (xy_2strjoin ("测速命令 ", curl_cmd)); diff --git a/src/chsrc.c b/src/chsrc.c index fd71e90..95d07ca 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -16,9 +16,11 @@ * chsrc: Change Source —— 全平台通用命令行换源工具 * ------------------------------------------------------------*/ -#define Chsrc_Version "v0.1.7.3-2024/08/18" -#define Chsrc_Maintain_URL "https://github.com/RubyMetric/chsrc" -#define Chsrc_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc" +#define Chsrc_Version "0.1.7.3" +#define Chsrc_Release_Date "2024/08/18" +#define Chsrc_Banner_Version "v" Chsrc_Version "-" Chsrc_Release_Date +#define Chsrc_Maintain_URL "https://github.com/RubyMetric/chsrc" +#define Chsrc_Maintain_URL2 "https://gitee.com/RubyMetric/chsrc" #include "chsrc.h" @@ -267,18 +269,25 @@ cli_print_target_features (FeatInfo f, const char *input_target_name) void cli_print_version () { - puts (xy_strjoin (3, "chsrc: Change Source (GPL-3.0) ", - xy_str_to_magenta (Chsrc_Version), " by RubyMetric")); + say ("chsrc " Chsrc_Version); + say ("Copyright (C) 2024 Aoran Zeng, Heng Guo"); + say ("License GPLv3+: GNU GPL version 3 or later "); + say ("This is free software: you are free to change and redistribute it."); + say ("There is NO WARRANTY, to the extent permitted by law."); + br(); + say ("Written by Aoran Zeng, Heng Guo and contributors. (See chsrc.c)"); } void cli_print_help () { + say (xy_strjoin (3, "chsrc: Change Source (GPLv3+) ", + to_purple (Chsrc_Banner_Version), " by RubyMetric")); br(); for (int i=0; i= 11) { makeup = xy_strjoin (9, - "# Generated by chsrc " Chsrc_Version "(" Chsrc_Maintain_URL ")\n\n" + "# Generated by chsrc " Chsrc_Banner_Version "(" Chsrc_Maintain_URL ")\n\n" "deb " Chsrc_Maintain_URL "/debian ", codename, " main contrib non-free\n" "deb " Chsrc_Maintain_URL "/debian ", codename, "-updates main contrib non-free\n" "deb " Chsrc_Maintain_URL "/debian ", codename, "-backports main contrib non-free\n" @@ -103,7 +103,7 @@ ensure_apt_sourcelist (int debian_type) else if (version >= 10) { makeup = xy_strjoin (9, - "# Generated by chsrc " Chsrc_Version "(" Chsrc_Maintain_URL ")\n\n" + "# Generated by chsrc " Chsrc_Banner_Version "(" Chsrc_Maintain_URL ")\n\n" "deb " Chsrc_Maintain_URL "/debian ", codename, " main contrib non-free\n" "deb " Chsrc_Maintain_URL "/debian ", codename, "-updates main contrib non-free\n" "deb " Chsrc_Maintain_URL "/debian ", codename, "-backports main contrib non-free\n" diff --git a/src/recipe/ware/Homebrew.c b/src/recipe/ware/Homebrew.c index 54e8c25..7fd24ad 100644 --- a/src/recipe/ware/Homebrew.c +++ b/src/recipe/ware/Homebrew.c @@ -47,7 +47,7 @@ wr_homebrew_setsrc (char *option) { chsrc_yield_source_and_confirm (wr_homebrew); - char *splitter = "\n\n# Generated by chsrc " Chsrc_Version; + char *splitter = "\n\n# Generated by chsrc " Chsrc_Banner_Version; char *api_domain = xy_strjoin (3, "export HOMEBREW_API_DOMAIN=\"", xy_2strjoin (source.url, "homebrew-bottles/api"), "\""); char *bottle_domain = xy_strjoin (3, "export HOMEBREW_BOTTLE_DOMAIN=\"", xy_2strjoin (source.url, "homebrew-bottles"), "\""); char *brew_git_remote = xy_strjoin (3, "export HOMEBREW_BREW_GIT_REMOTE=\"", xy_2strjoin (source.url, "git/homebrew/brew.git"), "\"");