study/chsrc
1
0
Fork 0
mirror of https://github.com/RubyMetric/chsrc synced 2025-09-09 22:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 合并问题

Browse Source
This commit is contained in:
BingChunMoLi 2025-08-23 14:50:03 +08:00
parent 93088fe4b8
commit c872c9122d
No known key found for this signature in database
GPG Key ID: E08FCE087CD04CCC
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/framework/core.c
View File

@ -133,8 +133,8 @@ ProgStatus =
.leader_selected_index = -1, .leader_selected_index = -1,
.chgtype = ChgType_Auto, .chgtype = ChgType_Auto,
.chsrc_run_faas = false, .chsrc_run_faas = false,
.user_agent = NULL; .user_agent = NULL
}; }
/* Global Program Store */ /* Global Program Store */
@ -643,7 +643,7 @@ measure_speed_for_url (void *url)
/** /**
* @note 我们用 —L，因为部分链接会跳转到其他地方，比如: RubyChina, npmmirror * @note 我们用 —L，因为部分链接会跳转到其他地方，比如: RubyChina, npmmirror
*/ */
char *curl_cmd = #xy_strcat (8, "curl -qsL ", ipv6, char *curl_cmd = xy_strcat (8, "curl -qsL ", ipv6,
" -o ", os_devnull, " -o ", os_devnull,
" -w \"%{http_code} %{speed_download}\" -m", time_sec, " -w \"%{http_code} %{speed_download}\" -m", time_sec,
" -A ", ProgStatus.user_agent, " ", url); " -A ", ProgStatus.user_agent, " ", url);

10
src/recipe/lang/Java.c
View File

@ -72,7 +72,7 @@ pl_java_find_maven_config ()
{ {
char *maven_home_line = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home); char *maven_home_line = xy_run_iter ("mvn -v", 0, pl_java_find_maven_home);
char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: "); char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml")); char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml"));
return maven_config; return maven_config;
} }
else else
@ -91,7 +91,7 @@ pl_java_find_maven_daemon_config ()
{ {
char *maven_home_line = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home); char *maven_home_line = xy_run_iter ("mvnd -v", 0, pl_java_find_maven_home);
char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: "); char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml")); char *maven_config = xy_normalize_path (xy_2strcat (maven_home, "/conf/settings.xml"));
return maven_config; return maven_config;
} }
else else
@ -110,12 +110,12 @@ pl_java_getsrc (char *option)
if (maven_exist) if (maven_exist)
{ {
char *maven_config = pl_java_find_maven_config (); char *maven_config = pl_java_find_maven_config ();
chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); chsrc_note2 (xy_strcat ("请查看 ", maven_config));
} }
if(maven_daemon_exist) if(maven_daemon_exist)
{ {
char *maven_config = pl_java_find_maven_daemon_config (); char *maven_config = pl_java_find_maven_daemon_config ();
chsrc_note2 (xy_2strcat ("请查看 ", maven_config)); chsrc_note2 (xy_strcat ("请查看 ", maven_config));
} }
} }
@ -151,7 +151,7 @@ pl_java_setsrc (char *option)
file = xy_str_gsub (file, "@name@", source.mirror->name); file = xy_str_gsub (file, "@name@", source.mirror->name);
file = xy_str_gsub (file, "@url@", source.url); file = xy_str_gsub (file, "@url@", source.url);
char *maven_config = pl_java_find_maven_daemon_config (); char *maven_config = pl_java_find_maven_daemon_config ();
chsrc_note2 (xy_strjoin (3, "请在 maven 配置文件 ", maven_config, " 中添加:")); chsrc_note2 (xy_strcat (3, "请在 maven 配置文件 ", maven_config, " 中添加:"));
println (file); println (file);
} }

2
src/recipe/lang/Ruby/Ruby.c
View File

@ -59,7 +59,7 @@ pl_ruby_remove_gem_source (const char *source)
cmd = xy_2strcat ("gem sources -r ", source); cmd = xy_2strcat ("gem sources -r ", source);
chsrc_run (cmd, RunOpt_Default); chsrc_run (cmd, RunOpt_Default);
} }
return false return false;
} }
/** /**