diff --git a/include/source.h b/include/source.h index 3a46539..15d6ff9 100644 --- a/include/source.h +++ b/include/source.h @@ -174,22 +174,6 @@ os_msys2_sources[] = { -/** - * @time 2023-09-06 更新 - * @note 源并不完整,且未经测试是否有效 - */ -os_openeuler_sources[] = { - {&Upstream, NULL}, - {&Ali, "https://mirrors.aliyun.com/openeuler/"}, - {&Bfsu, "https://mirrors.bfsu.edu.cn/openeuler/"}, - {&Ustc, "https://mirrors.ustc.edu.cn/openeuler/"}, - {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/openeuler/"}, - {&Tencent, "https://mirrors.tencent.com/openeuler/"}, - {&Netease, "https://mirrors.163.com/openeuler/"}, - {&Sohu, "https://mirrors.sohu.com/openeuler/"} -}, - - /** * @time 2024-06-12 更新 */ @@ -323,7 +307,7 @@ def_sources_n(pl_dotnet); def_sources_n(os_msys2); -def_sources_n(os_openeuler); def_sources_n(os_openkylin); +def_sources_n(os_openkylin); def_sources_n(os_anolis); def_sources_n(wr_winget); diff --git a/src/chsrc.c b/src/chsrc.c index 79c45d4..54732f2 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -92,9 +92,11 @@ pl_clojure_setsrc (char *option) #include "recipe/os/opensuse.c" +#include "recipe/os/yum-family/common.h" #include "recipe/os/yum-family/Fedora-Linux.c" #include "recipe/os/yum-family/AlmaLinux.c" #include "recipe/os/yum-family/Rocky-Linux.c" +#include "recipe/os/yum-family/openEuler.c" /** * HELP: 未经测试 @@ -155,31 +157,6 @@ os_manjaro_setsrc (char *option) -/** - * HELP: 未经测试 - */ -void -os_openeuler_setsrc (char *option) -{ - chsrc_ensure_root (); - - SourceInfo source; - chsrc_yield_source (os_openeuler); - chsrc_confirm_source (&source); - - chsrc_backup ("/etc/yum.repos.d/openEuler.repo"); - - char *towrite = xy_strjoin (3, "s#http://repo.openeuler.org#", - source.url, - "#\'< /etc/yum.repos.d/openEuler.repo.bak"); - - chsrc_overwrite_file (towrite, "/etc/yum.repos.d/openEuler.repo"); - - chsrc_run ("dnf makecache", RunOpt_No_Last_New_Line); - chsrc_say_lastly (&source, ChsrcTypeAuto); -} - - /** * 参考: https://mirrors.hust.edu.cn/docs/anolis */ diff --git a/src/recipe/catalog.c b/src/recipe/catalog.c index a2d85a9..9efcaa3 100644 --- a/src/recipe/catalog.c +++ b/src/recipe/catalog.c @@ -40,7 +40,6 @@ static const char def_target(os_openkylin); -def_target_noget(os_openeuler); def_target_noget(os_anolis); def_target_noget(os_msys2); TargetInfo os_manjaro_target = {NULL, os_manjaro_setsrc, NULL, NULL, 0}; @@ -70,10 +69,10 @@ static const char *os_armbian [] = {"armbian", NULL, t(&os_armbian_target)}, *os_openwrt [] = {"openwrt", "opkg", "LEDE", NULL, t(&os_openwrt_target)}, -*os_openkylin [] = {"kylin", "openkylin", NULL, t(&os_openkylin_target)}, -*os_openeuler [] = {"euler", "openeuler", NULL, t(&os_openeuler_target)}, +*os_openkylin [] = {"openkylin", NULL, t(&os_openkylin_target)}, +*os_openeuler [] = {"openeuler", NULL, t(&os_openeuler_target)}, +*os_anolis [] = {"openanolis", NULL, t(&os_anolis_target)}, *os_deepin [] = {"deepin", NULL, t(&os_deepin_target)}, -*os_anolis [] = {"anolis", "openanolis", NULL, t(&os_anolis_target)}, *os_freebsd [] = {"freebsd", NULL, t(&os_freebsd_target)}, *os_netbsd [] = {"netbsd", NULL, t(&os_netbsd_target)}, diff --git a/src/recipe/os/yum-family/common.h b/src/recipe/os/yum-family/common.h new file mode 100644 index 0000000..ff74396 --- /dev/null +++ b/src/recipe/os/yum-family/common.h @@ -0,0 +1,13 @@ +/** ------------------------------------------------------------ + * SPDX-License-Identifier: GPL-3.0-or-later + * ------------------------------------------------------------- + * File Authors : Aoran Zeng + * Contributors : Nil Null + * Created On : <2024-08-16> + * Last Modified : <2024-08-16> + * ------------------------------------------------------------*/ + +// #define OS_Yum_SourceList "/etc/yum.repos" +#define OS_Yum_SourceList_D "/etc/yum.repos.d/" + +#define OS_openEuler_SourceList "openEuler.repo" diff --git a/src/recipe/os/yum-family/openEuler.c b/src/recipe/os/yum-family/openEuler.c new file mode 100644 index 0000000..9e0f864 --- /dev/null +++ b/src/recipe/os/yum-family/openEuler.c @@ -0,0 +1,51 @@ +/** ------------------------------------------------------------ + * SPDX-License-Identifier: GPL-3.0-or-later + * ------------------------------------------------------------- + * File Authors : Heng Guo <2085471348@qq.com> + * Contributors : Nil Null + * Created On : <2023-09-06> + * Last Modified : <2024-08-16> + * ------------------------------------------------------------*/ + +/** + * @time 2023-09-06 更新 + * @note 源并不完整,且未经测试是否有效 + */ +static SourceInfo +os_openeuler_sources[] = { + {&Upstream, NULL}, + {&Ali, "https://mirrors.aliyun.com/openeuler/"}, + {&Bfsu, "https://mirrors.bfsu.edu.cn/openeuler/"}, + {&Ustc, "https://mirrors.ustc.edu.cn/openeuler/"}, + {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/openeuler/"}, + {&Tencent, "https://mirrors.tencent.com/openeuler/"}, + {&Netease, "https://mirrors.163.com/openeuler/"}, + {&Sohu, "https://mirrors.sohu.com/openeuler/"} +}; +def_sources_n(os_openeuler); + +/** + * HELP: 未经测试 + */ +void +os_openeuler_setsrc (char *option) +{ + chsrc_ensure_root (); + + SourceInfo source; + chsrc_yield_source (os_openeuler); + chsrc_confirm_source (&source); + + chsrc_backup (OS_openEuler_SourceList); + + char *towrite = xy_strjoin (3, "s#http://repo.openeuler.org#", + source.url, + "#\'< /etc/yum.repos.d/openEuler.repo.bak"); + + chsrc_overwrite_file (towrite, OS_openEuler_SourceList); + + chsrc_run ("dnf makecache", RunOpt_No_Last_New_Line); + chsrc_say_lastly (&source, ChsrcTypeAuto); +} + +def_target_noget(os_openeuler);