diff --git a/src/chsrc.c b/src/chsrc.c index e1aa770..a0e3632 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -95,8 +95,10 @@ pl_clojure_setsrc (char *option) #include "recipe/os/opensuse.c" -#include "recipe/os/arch.c" -#include "recipe/os/MSYS2.c" + +#include "recipe/os/pacman-family/Arch-Linux.c" +#include "recipe/os/pacman-family/Manjaro-Linux.c" +#include "recipe/os/pacman-family/MSYS2.c" #include "recipe/os/gentoo.c" #include "recipe/os/alpine.c" @@ -105,22 +107,6 @@ pl_clojure_setsrc (char *option) -/** - * 似乎会弹出GUI,待确定 - */ -void -os_manjaro_setsrc (char *option) -{ - chsrc_ensure_root (); - char *cmd = "pacman-mirrors -i -c China -m rank"; - chsrc_run (cmd, RunOpt_Default); - - chsrc_run ("pacman -Syy", RunOpt_No_Last_New_Line); - chsrc_say_lastly (NULL, ChsrcTypeAuto); -} - - - #include "recipe/os/openwrt.c" diff --git a/src/recipe/catalog.c b/src/recipe/catalog.c index 570698a..e943fd2 100644 --- a/src/recipe/catalog.c +++ b/src/recipe/catalog.c @@ -39,8 +39,6 @@ static const char }; -TargetInfo os_manjaro_target = {NULL, os_manjaro_setsrc, NULL, NULL, 0}; - static const char *os_ubuntu [] = {"ubuntu", NULL, t(&os_ubuntu_target)}, *os_linuxmint [] = {"linuxmint", "mint", NULL, t(&os_linuxmint_target)}, diff --git a/src/recipe/os/arch.c b/src/recipe/os/pacman-family/Arch-Linux.c similarity index 100% rename from src/recipe/os/arch.c rename to src/recipe/os/pacman-family/Arch-Linux.c diff --git a/src/recipe/os/MSYS2.c b/src/recipe/os/pacman-family/MSYS2.c similarity index 100% rename from src/recipe/os/MSYS2.c rename to src/recipe/os/pacman-family/MSYS2.c diff --git a/src/recipe/os/pacman-family/Manjaro-Linux.c b/src/recipe/os/pacman-family/Manjaro-Linux.c new file mode 100644 index 0000000..4228c58 --- /dev/null +++ b/src/recipe/os/pacman-family/Manjaro-Linux.c @@ -0,0 +1,26 @@ +/** ------------------------------------------------------------ + * 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> + * + * Manjaro Linux(或简称Manjaro)基于Arch Linux + * ------------------------------------------------------------*/ + +/** + * 似乎会弹出GUI,待确定 + */ +void +os_manjaro_setsrc (char *option) +{ + chsrc_ensure_root (); + char *cmd = "pacman-mirrors -i -c China -m rank"; + chsrc_run (cmd, RunOpt_Default); + + chsrc_run ("pacman -Syy", RunOpt_No_Last_New_Line); + chsrc_say_lastly (NULL, ChsrcTypeAuto); +} + +TargetInfo os_manjaro_target = {NULL, os_manjaro_setsrc, NULL, NULL, 0};