diff --git a/include/source.h b/include/source.h index c488753..a7f7410 100644 --- a/include/source.h +++ b/include/source.h @@ -149,25 +149,6 @@ pl_dotnet_sources[] = { {&Upstream, NULL}, {&NugetOrg, "https://www.nuget.org/api/v2/"}, {&Huawei, "https://mirrors.huaweicloud.com/repository/nuget/v3"} -}, - - - -/** - * @time 2023-09-10 更新 - * @note { - * 我们这里挑选的必须也支持 Flutter - * 我们将会在setsrc函数中生成 - * 1. https://mirrors.tuna.tsinghua.edu.cn/dart-pub - * 2. https://mirrors.tuna.tsinghua.edu.cn/flutter - * } - */ -pl_dart_sources[] = { - {&Upstream, NULL}, - // {&Sjtug_Zhiyuan, "https://mirror.sjtu.edu.cn/"}, // 不确定SJTUG的flutter镜像给的对不对 - {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/"}, - {&Tencent, "https://mirrors.cloud.tencent.com/"}, - {&Nju, "https://mirror.nju.edu.cn/"} }; @@ -678,7 +659,7 @@ wr_tex_sources[] = { def_sources_n(pl_clojure); -def_sources_n(pl_dotnet); def_sources_n(pl_dart); +def_sources_n(pl_dotnet); def_sources_n(os_ubuntu); def_sources_n(os_mint); def_sources_n(os_debian); def_sources_n(os_fedora); diff --git a/src/chsrc.c b/src/chsrc.c index aa3ac8e..47c5eca 100644 --- a/src/chsrc.c +++ b/src/chsrc.c @@ -63,70 +63,7 @@ pl_clojure_setsrc (char *option) } - -void -pl_dart_getsrc (char *option) -{ - char *cmd = NULL; - if (xy_on_windows) - { - cmd = "set PUB_HOSTED_URL & set FLUTTER_STORAGE_BASE_URL"; - chsrc_run (cmd, RunOpt_Default); - } - else - { - cmd = "echo $PUB_HOSTED_URL; echo $FLUTTER_STORAGE_BASE_URL"; - chsrc_run (cmd, RunOpt_Default); - } -} - -/** - * Dart pub 换源，参考：https://mirrors.tuna.tsinghua.edu.cn/help/dart-pub/ - */ -void -pl_dart_setsrc (char *option) -{ - SourceInfo source; - chsrc_yield_source (pl_dart); - chsrc_confirm_source (&source); - - char *towrite = NULL; - - char *pub = xy_2strjoin(source.url, "dart-pub"); - char *flutter = xy_2strjoin(source.url, "flutter"); - - if (xy_on_windows) - { - if (xy_file_exist (xy_win_powershell_profile)) - { - towrite = xy_strjoin (4, "$env:PUB_HOSTED_URL = \"", pub, "\""); - chsrc_append_to_file (towrite, xy_win_powershell_profile); - - towrite = xy_strjoin (4, "$env:FLUTTER_STORAGE_BASE_URL = \"", flutter, "\""); - chsrc_append_to_file (towrite, xy_win_powershell_profile); - } - - if (xy_file_exist (xy_win_powershellv5_profile)) - { - towrite = xy_strjoin (4, "$env:PUB_HOSTED_URL = \"", pub, "\""); - chsrc_append_to_file (towrite, xy_win_powershellv5_profile); - - towrite = xy_strjoin (4, "$env:FLUTTER_STORAGE_BASE_URL = \"", flutter, "\""); - chsrc_append_to_file (towrite, xy_win_powershellv5_profile); - } - } - else - { - towrite = xy_strjoin (3, "export PUB_HOSTED_URL=\"", pub, "\""); - chsrc_append_to_file (towrite, "~/.bashrc >> ~/.zshrc"); - - towrite = xy_strjoin (3, "export FLUTTER_STORAGE_BASE_URL=\"", flutter, "\""); - chsrc_append_to_file (towrite, "~/.bashrc >> ~/.zshrc"); - } - chsrc_say_lastly (&source, ChsrcTypeUntested); -} - - +#include "recipe/lang/dart.c" #include "recipe/lang/haskell.c" #include "recipe/lang/ocaml.c" #include "recipe/lang/r.c" diff --git a/src/recipe/catalog.c b/src/recipe/catalog.c index 341c505..ce0b8b2 100644 --- a/src/recipe/catalog.c +++ b/src/recipe/catalog.c @@ -8,7 +8,6 @@ * ------------------------------------------------------------*/ /* Begin Target Matrix */ -def_target(pl_dart); def_target_noget (pl_clojure); def_target_noget (pl_dotnet); diff --git a/src/recipe/lang/dart.c b/src/recipe/lang/dart.c new file mode 100644 index 0000000..8062afa --- /dev/null +++ b/src/recipe/lang/dart.c @@ -0,0 +1,91 @@ +/** ------------------------------------------------------------ + * SPDX-License-Identifier: GPL-3.0-or-later + * ------------------------------------------------------------- + * File Authors : Aoran Zeng + * Contributors : Nil Null + * Created On : <2023-09-10> + * Last Modified : <2024-08-15> + * ------------------------------------------------------------*/ + +/** + * @time 2023-09-10 更新 + * @note { + * 我们这里挑选的必须也支持 Flutter + * 我们将会在setsrc函数中生成 + * 1. https://mirrors.tuna.tsinghua.edu.cn/dart-pub + * 2. https://mirrors.tuna.tsinghua.edu.cn/flutter + * } + */ +static SourceInfo +pl_dart_sources[] = { + {&Upstream, NULL}, + // {&Sjtug_Zhiyuan, "https://mirror.sjtu.edu.cn/"}, // 不确定SJTUG的flutter镜像给的对不对 + {&Tuna, "https://mirrors.tuna.tsinghua.edu.cn/"}, + {&Tencent, "https://mirrors.cloud.tencent.com/"}, + {&Nju, "https://mirror.nju.edu.cn/"} +}; +def_sources_n(pl_dart); + +void +pl_dart_getsrc (char *option) +{ + char *cmd = NULL; + if (xy_on_windows) + { + cmd = "set PUB_HOSTED_URL & set FLUTTER_STORAGE_BASE_URL"; + chsrc_run (cmd, RunOpt_Default); + } + else + { + cmd = "echo $PUB_HOSTED_URL; echo $FLUTTER_STORAGE_BASE_URL"; + chsrc_run (cmd, RunOpt_Default); + } +} + +/** + * Dart pub 换源，参考：https://mirrors.tuna.tsinghua.edu.cn/help/dart-pub/ + */ +void +pl_dart_setsrc (char *option) +{ + SourceInfo source; + chsrc_yield_source (pl_dart); + chsrc_confirm_source (&source); + + char *towrite = NULL; + + char *pub = xy_2strjoin(source.url, "dart-pub"); + char *flutter = xy_2strjoin(source.url, "flutter"); + + if (xy_on_windows) + { + if (xy_file_exist (xy_win_powershell_profile)) + { + towrite = xy_strjoin (4, "$env:PUB_HOSTED_URL = \"", pub, "\""); + chsrc_append_to_file (towrite, xy_win_powershell_profile); + + towrite = xy_strjoin (4, "$env:FLUTTER_STORAGE_BASE_URL = \"", flutter, "\""); + chsrc_append_to_file (towrite, xy_win_powershell_profile); + } + + if (xy_file_exist (xy_win_powershellv5_profile)) + { + towrite = xy_strjoin (4, "$env:PUB_HOSTED_URL = \"", pub, "\""); + chsrc_append_to_file (towrite, xy_win_powershellv5_profile); + + towrite = xy_strjoin (4, "$env:FLUTTER_STORAGE_BASE_URL = \"", flutter, "\""); + chsrc_append_to_file (towrite, xy_win_powershellv5_profile); + } + } + else + { + towrite = xy_strjoin (3, "export PUB_HOSTED_URL=\"", pub, "\""); + chsrc_append_to_file (towrite, "~/.bashrc >> ~/.zshrc"); + + towrite = xy_strjoin (3, "export FLUTTER_STORAGE_BASE_URL=\"", flutter, "\""); + chsrc_append_to_file (towrite, "~/.bashrc >> ~/.zshrc"); + } + chsrc_say_lastly (&source, ChsrcTypeUntested); +} + +def_target(pl_dart);