diff --git a/chsrc.c b/chsrc.c index 58c0539..f3d9fd6 100644 --- a/chsrc.c +++ b/chsrc.c @@ -1188,24 +1188,43 @@ os_arch_setsrc(char* option) chsrc_logcmd(backup); system(backup); + + xy_info ("chsrc: 备份文件名: /etc/pacman.d/mirrorlist.bak"); - char* new_file = xy_strjoin(3,"Server = ", + char* new_file ; + + + + char* arch = xy_getcmd("arch",NULL); + char* cmd; + if(strncmp(arch, "x86_64", 6)==0) + { + new_file = xy_strjoin(3,"Server = ", source.url, - "$repo/os/$arch"); - char* cmd = xy_strjoin(3,"echo ", - new_file, - " > /etc/pacman.d/mirrorlist"); - chsrc_logcmd(cmd); - system(cmd); - cmd = "cat /etc/pacman.d/mirrorlist.bak >> /etc/pacman.d/mirrorlist"; + "archlinux/$repo/os/$arch"); + + } + else { + new_file = xy_strjoin(3,"Server = ", + source.url, + "archlinuxarm/$repo/os/$arch"); + } + + cmd = xy_strjoin(3,"echo ", + new_file, + " > /etc/pacman.d/mirrorlist"); chsrc_logcmd(cmd); system(cmd); - // char* rm = "rm -rf /etc/pacman.d/mirrorlist.bak"; - // system(rm); + xy_info("For arch linux cn..."); + + cmd = xy_strjoin(3,"cat [archlinuxcn] \r\n Server=",source.url,"archlinuxcn/$repo/os/$arch >> /etc/pacman.d/mirrorlist"); + chsrc_logcmd(cmd); + system(cmd); + + xy_info ("Please use \"pacman -Syyu \" to update your source"); chsrc_say_thanks(&source); - xy_info ("Please use \"pacman -Syyu \" to update your source"); } diff --git a/sources.h b/sources.h index cb05f1f..c80d385 100644 --- a/sources.h +++ b/sources.h @@ -468,13 +468,13 @@ os_msys2_sources[] = { * TODO: 1. 源并不完整,且未经测试是否有效 */ os_arch_sources[] = { - {&Ali, "https://mirrors.aliyun.com/archlinux/"}, - {&Bfsu, "https://mirrors.bfsu.edu.cn/archlinux/"}, - {&Ustc, "https://mirrors.ustc.edu.cn/archlinux/"}, - {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/archlinux/"}, - {&Tencent, "https://mirrors.tencent.com/archlinux/"}, - {&Netease, "https://mirrors.163.com/archlinux/"}, - {&Sohu, "https://mirrors.sohu.com/archlinux/"} + {&Ali, "https://mirrors.aliyun.com/"}, + {&Bfsu, "https://mirrors.bfsu.edu.cn/"}, + {&Ustc, "https://mirrors.ustc.edu.cn/"}, + {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/"}, + {&Tencent, "https://mirrors.tencent.com/"}, + {&Netease, "https://mirrors.163.com/"}, + {&Sohu, "https://mirrors.sohu.com/"} }, /**