From f8cf0e9928c58417b33bdf6f4c20b4c60f519eba Mon Sep 17 00:00:00 2001 From: Aoran Zeng Date: Tue, 11 Jun 2024 17:49:35 +0800 Subject: [PATCH] Remove the line split for makeup [GitHub link #23] --- src/chsrc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/chsrc.c b/src/chsrc.c index bfdb913..ae78391 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -857,17 +857,19 @@ makeup_etc_apt_sourcelist () if (exist) { - chsrc_infolog_remarkably (ETC_APT_SOURCELIST "存在"); + chsrc_infolog_remarkably (ETC_APT_SOURCELIST " 存在"); return; } else { - chsrc_error_remarkably (ETC_APT_SOURCELIST "缺失,将替补") + chsrc_warn_remarkably (ETC_APT_SOURCELIST " 文件缺失,将替补") } char *codename = xy_run ("sed -nr 's/VERSION_CODENAME=(.*)/\1/p' " ETC_OSRELEASE, 0, NULL); + codename = xy_str_delete_suffix (codename, "\n"); char *makeup = xy_strjoin (9, + "# Generated by " Chsrc_Version "\n" "deb " Chsrc_Maintain_URL, codename, " main restricted universe multiverse\n" "deb " Chsrc_Maintain_URL, codename, "-updates main restricted universe multiverse\n" "deb " Chsrc_Maintain_URL, codename, "-backports main restricted universe multiverse\n"