Remove the line split for makeup

ccmywish · ccmywish · commit f8cf0e9928c5 · 2024-06-11T17:49:35.000+08:00
[GitHub link #23]
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -857,17 +857,19 @@ makeup_etc_apt_sourcelist ()`
`857`	`857`
`858`	`858`	`if (exist)`
`859`	`859`	`{`
`860`		`- chsrc_infolog_remarkably (ETC_APT_SOURCELIST "存在");`
	`860`	`+ chsrc_infolog_remarkably (ETC_APT_SOURCELIST " 存在");`
`861`	`861`	`return;`
`862`	`862`	`}`
`863`	`863`	`else`
`864`	`864`	`{`
`865`		`- chsrc_error_remarkably (ETC_APT_SOURCELIST "缺失，将替补")`
	`865`	`+ chsrc_warn_remarkably (ETC_APT_SOURCELIST " 文件缺失，将替补")`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`char codename = xy_run ("sed -nr 's/VERSION_CODENAME=(.)/\1/p' " ETC_OSRELEASE, 0, NULL);`
	`869`	`+ codename = xy_str_delete_suffix (codename, "\n");`
`869`	`870`
`870`	`871`	`char *makeup = xy_strjoin (9,`
	`872`	`+ "# Generated by " Chsrc_Version "\n"`
`871`	`873`	`"deb " Chsrc_Maintain_URL, codename, " main restricted universe multiverse\n"`
`872`	`874`	`"deb " Chsrc_Maintain_URL, codename, "-updates main restricted universe multiverse\n"`
`873`	`875`	`"deb " Chsrc_Maintain_URL, codename, "-backports main restricted universe multiverse\n"`