diff --git a/chsrc.c b/chsrc.c index 7bb49e0..8eadce4 100644 --- a/chsrc.c +++ b/chsrc.c @@ -1360,7 +1360,7 @@ os_openkylin_setsrc (char* option) chsrc_backup (ETC_APT_SOURCELIST); - char* cmd = xy_strjoin(3, "sed -E -i \'s@https?://.*/openkylin/?@", source.url, "@g\' /etc/apt/sources.list"); + char* cmd = xy_strjoin(3, "sed -E -i 's@https?://.*/openkylin/?@", source.url, "@g'" ETC_APT_SOURCELIST); chsrc_run(cmd); chsrc_run("sudo apt update"); chsrc_say_thanks(&source); @@ -1888,7 +1888,7 @@ target_info os_gentoo_target = {os_gentoo_setsrc, NULL, os_gentoo_sources, os_gentoo_sources_n}, os_rocky_target = {os_rocky_setsrc, NULL, os_rocky_sources, os_rocky_sources_n}, os_freebsd_target = {os_freebsd_setsrc, NULL, os_freebsd_sources, os_freebsd_sources_n}, - os_openeuler_target = {os_openeuler_setsrc, NULL, os_openeuler_sources, os_openeuler_sources_n}, + os_openeuler_target = {os_openeuler_setsrc, NULL, os_openeuler_sources, os_openeuler_sources_n}; static const char *os_ubuntu [] = {"ubuntu", NULL, targetinfo(&os_ubuntu_target)}, diff --git a/sources.h b/sources.h index e3f0e4b..334873e 100644 --- a/sources.h +++ b/sources.h @@ -110,8 +110,12 @@ mirror_info GoProxyIO = {"goproxy.io", "GOPROXY.IO", "GOPROXY.IO", "https://goproxy.io/", "https://goproxy.io/github.com/aws/aws-sdk-go/@v/v1.45.2.zip"}, // 30 MB - NugetOrg = {"nuget.org", "NuGet Org", "Nuget Organization", "https://www.nuget.org/", NULL}, - EmacsChina = {"emacschina", "EmacsChina", "Emacs China 社区", "https://elpamirror.emacs-china.org/", NULL}; + NugetOrg = {"nuget.org", "NuGet Org", "Nuget Organization", "https://www.nuget.org/", NULL}, + EmacsChina = {"emacschina", "EmacsChina", "Emacs China 社区", "https://elpamirror.emacs-china.org/", NULL}; + + +mirror_info + Upstream = {"upstream", "Upstream", "上游默认源", NULL, NULL}; mirror_info* @@ -120,6 +124,8 @@ available_mirrors[] = { &Ali, &Tencent, &Netease, &Sohu, &Api7, &RubyChina, &EmacsChina, &NpmMirror, &GoProxyCN, &GoProxyIO, // 暂不支持 &NugetOrg + + // 不要列出 &Upstream }; @@ -655,18 +661,12 @@ os_openeuler_sources[] = { /** - * 2023-09-06 更新 - * - * TODO: 1. 源并不完整,且未经测试是否有效 + * 2023-09-29 更新 */ os_openkylin_sources[] = { + {&Upstream, "https://archive.openkylin.top/openkylin/"}, {&Ali, "https://mirrors.aliyun.com/openkylin/"}, - {&Bfsu, "https://mirrors.bfsu.edu.cn/openkylin/"}, - {&Ustc, "https://mirrors.ustc.edu.cn/openkylin/"}, - {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/openkylin/"}, - {&Tencent, "https://mirrors.tencent.com/openkylin/"}, {&Netease, "https://mirrors.163.com/openkylin/"}, - {&Sohu, "https://mirrors.sohu.com/openkylin/"} };