diff --git a/src/recipe/menu.c b/src/recipe/menu.c index 9f5c775..38e3497 100644 --- a/src/recipe/menu.c +++ b/src/recipe/menu.c @@ -89,7 +89,7 @@ chsrc_wr_menu[] = {t(wr_winget), "winget"}, {t(wr_homebrew), "brew homebrew"}, {t(wr_cocoapods), "cocoa cocoapods cocoapod"}, - {t(wr_dockerhub), "dockerhub docker"}, + {t(wr_docker), "docker dockerhub"}, {t(wr_flatpak), "flatpak flathub"}, {t(wr_nix), "nix"}, {t(wr_guix), "guix"}, diff --git a/src/recipe/ware/Docker-Hub/rawstr4c.h b/src/recipe/ware/Docker-Hub/rawstr4c.h deleted file mode 100644 index 7cad728..0000000 --- a/src/recipe/ware/Docker-Hub/rawstr4c.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -/** - * Generated by rawstr4c v1.0.0-2025/08/09 - */ - -char RAWSTR_wr_dockerhub_insert_content[] = "\x7b\x0a\x20\x20\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x20\x5b\x22\x40\x31\x40\x22\x5d\x0a\x7d"; - -char RAWSTR_wr_dockerhub_check_cmd[] = "\x6a\x71\x20\x27\x2e\x5b\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x5d\x20\x7c\x20\x69\x6e\x64\x65\x78\x28\x22\x40\x31\x40\x22\x29\x27\x20\x40\x32\x40"; - -char RAWSTR_wr_dockerhub_insert_cmd[] = "\x6a\x71\x20\x27\x2e\x5b\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x5d\x20\x7c\x3d\x20\x5b\x22\x40\x31\x40\x22\x5d\x20\x2b\x20\x2e\x27\x20\x40\x32\x40\x2e\x62\x61\x6b\x20\x3e\x20\x20\x40\x32\x40"; - -char RAWSTR_wr_dockerhub_sed_command[] = "\x73\x65\x64\x20\x2d\x7a\x20\x2d\x69\x20\x27\x73\x2f\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x5b\x5e\x5d\x5d\x2a\x5d\x2f\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x5b\x22\x40\x31\x40\x22\x5d\x2f\x27\x20\x40\x32\x40"; - diff --git a/src/recipe/ware/Docker-Hub/Docker-Hub.c b/src/recipe/ware/Docker/Docker.c similarity index 76% rename from src/recipe/ware/Docker-Hub/Docker-Hub.c rename to src/recipe/ware/Docker/Docker.c index 1a2a97d..bb7d58c 100644 --- a/src/recipe/ware/Docker-Hub/Docker-Hub.c +++ b/src/recipe/ware/Docker/Docker.c @@ -19,13 +19,13 @@ Fit2Cloud = {SKIP, ToFill, ToFill, NULL, ROUGH} }; -def_target(wr_dockerhub); +def_target(wr_docker); void -wr_dockerhub_prelude () +wr_docker_prelude () { - use_this(wr_dockerhub); - chef_allow_gs(wr_dockerhub); + use_this(wr_docker); + chef_allow_gs(wr_docker); chef_set_created_on (this, "2024-06-08"); chef_set_last_updated (this, "2025-08-09"); @@ -49,14 +49,14 @@ wr_dockerhub_prelude () def_sources_end() } -#define WR_DockerHub_ConfigFile "/etc/docker/daemon.json" +#define WR_Docker_ConfigFile "/etc/docker/daemon.json" void -wr_dockerhub_getsrc (char *option) +wr_docker_getsrc (char *option) { if (xy_on_linux || xy_on_bsd) { - chsrc_view_file (WR_DockerHub_ConfigFile); + chsrc_view_file (WR_Docker_ConfigFile); } else { @@ -71,26 +71,26 @@ wr_dockerhub_getsrc (char *option) * 2. https://www.cnblogs.com/yuzhihui/p/17461781.html */ void -wr_dockerhub_setsrc (char *option) +wr_docker_setsrc (char *option) { chsrc_ensure_root (); - use_this_source(wr_dockerhub); + use_this_source(wr_docker); if (xy_on_linux || xy_on_bsd) { - char *to_add = xy_str_gsub (RAWSTR_wr_dockerhub_insert_content, "@1@", source.url); + char *to_add = xy_str_gsub (RAWSTR_wr_docker_insert_content, "@1@", source.url); - if (chsrc_check_file (WR_DockerHub_ConfigFile)) + if (chsrc_check_file (WR_Docker_ConfigFile)) { chsrc_note2 ("已找到Docker配置文件，将自动换源"); - chsrc_backup (WR_DockerHub_ConfigFile); + chsrc_backup (WR_Docker_ConfigFile); if (chsrc_check_program_quietly ("jq")) { /* 检查是否已经存在 source.url */ - char *cmd = xy_str_gsub (RAWSTR_wr_dockerhub_check_cmd, "@1@", source.url); - cmd = xy_str_gsub (cmd, "@2@", WR_DockerHub_ConfigFile); + char *cmd = xy_str_gsub (RAWSTR_wr_docker_check_cmd, "@1@", source.url); + cmd = xy_str_gsub (cmd, "@2@", WR_Docker_ConfigFile); char *result = xy_run (cmd, 0); if (result && !xy_streql (result, "null")) @@ -99,8 +99,8 @@ wr_dockerhub_setsrc (char *option) } else { - cmd = xy_str_gsub (RAWSTR_wr_dockerhub_insert_cmd, "@1@", source.url); - cmd = xy_str_gsub (cmd, "@2@", WR_DockerHub_ConfigFile); + cmd = xy_str_gsub (RAWSTR_wr_docker_insert_cmd, "@1@", source.url); + cmd = xy_str_gsub (cmd, "@2@", WR_Docker_ConfigFile); chsrc_run (cmd, RunOpt_Default); chsrc_succ2 ("源已添加"); } @@ -108,8 +108,8 @@ wr_dockerhub_setsrc (char *option) else { chsrc_alert2 ("未找到 jq 命令, 将使用 sed 换源"); - char *cmd = xy_str_gsub (RAWSTR_wr_dockerhub_sed_command, "@1@", source.url); - cmd = xy_str_gsub (cmd, "@2@", WR_DockerHub_ConfigFile); + char *cmd = xy_str_gsub (RAWSTR_wr_docker_sed_command, "@1@", source.url); + cmd = xy_str_gsub (cmd, "@2@", WR_Docker_ConfigFile); chsrc_run (cmd, RunOpt_Default); } } @@ -118,9 +118,9 @@ wr_dockerhub_setsrc (char *option) /* 不存在 /etc/docker/daemon.json 时可以直接写入文件 */ chsrc_alert2 ("未找到Docker配置文件, 将自动创建"); chsrc_ensure_dir ("/etc/docker"); - chsrc_run ( xy_2strjoin ("touch ", WR_DockerHub_ConfigFile), RunOpt_Default); + chsrc_run ( xy_2strjoin ("touch ", WR_Docker_ConfigFile), RunOpt_Default); - chsrc_append_to_file (to_add, WR_DockerHub_ConfigFile); + chsrc_append_to_file (to_add, WR_Docker_ConfigFile); } if (xy_on_linux) diff --git a/src/recipe/ware/Docker-Hub/README.md b/src/recipe/ware/Docker/README.md similarity index 88% rename from src/recipe/ware/Docker-Hub/README.md rename to src/recipe/ware/Docker/README.md index 3115732..f31051d 100644 --- a/src/recipe/ware/Docker-Hub/README.md +++ b/src/recipe/ware/Docker/README.md @@ -1,4 +1,4 @@ -# Docker Hub +# Docker - USTC 与 SJTUG 于 2024-06-06 停止支持 DockerHub - NJU 于 2024-06-07 停止支持 DockerHub diff --git a/src/recipe/ware/Docker/rawstr4c.h b/src/recipe/ware/Docker/rawstr4c.h new file mode 100644 index 0000000..a87fd24 --- /dev/null +++ b/src/recipe/ware/Docker/rawstr4c.h @@ -0,0 +1,14 @@ +#pragma once + +/** + * Generated by rawstr4c v1.0.0-2025/08/09 + */ + +char RAWSTR_wr_docker_insert_content[] = "\x7b\x0a\x20\x20\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x20\x5b\x22\x40\x31\x40\x22\x5d\x0a\x7d"; + +char RAWSTR_wr_docker_check_cmd[] = "\x6a\x71\x20\x27\x2e\x5b\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x5d\x20\x7c\x20\x69\x6e\x64\x65\x78\x28\x22\x40\x31\x40\x22\x29\x27\x20\x40\x32\x40"; + +char RAWSTR_wr_docker_insert_cmd[] = "\x6a\x71\x20\x27\x2e\x5b\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x5d\x20\x7c\x3d\x20\x5b\x22\x40\x31\x40\x22\x5d\x20\x2b\x20\x2e\x27\x20\x40\x32\x40\x2e\x62\x61\x6b\x20\x3e\x20\x20\x40\x32\x40"; + +char RAWSTR_wr_docker_sed_command[] = "\x73\x65\x64\x20\x2d\x7a\x20\x2d\x69\x20\x27\x73\x2f\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x5b\x5e\x5d\x5d\x2a\x5d\x2f\x22\x72\x65\x67\x69\x73\x74\x72\x79\x2d\x6d\x69\x72\x72\x6f\x72\x73\x22\x3a\x5b\x22\x40\x31\x40\x22\x5d\x2f\x27\x20\x40\x32\x40"; + diff --git a/src/recipe/ware/Docker-Hub/rawstr4c.md b/src/recipe/ware/Docker/rawstr4c.md similarity index 95% rename from src/recipe/ware/Docker-Hub/rawstr4c.md rename to src/recipe/ware/Docker/rawstr4c.md index e9a6487..de6185a 100644 --- a/src/recipe/ware/Docker-Hub/rawstr4c.md +++ b/src/recipe/ware/Docker/rawstr4c.md @@ -6,12 +6,12 @@ ! | happy game ! Contributors : Nil Null ! Created On : <2025-07-14> - ! Last Modified : <2025-08-09> + ! Last Modified : <2025-08-10> ! ---------------------------------------------------------- --> # rawstr4c input -- prefix = `RAWSTR_wr_dockerhub` +- prefix = `RAWSTR_wr_docker` - output = `:global-variable-only-header` - translate = `:hex` - no-postfix = `true`