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

fix: 补充缺少的 pl_java_find_maven_home and pl_java_is_home

Browse Source 
添加maven-daemon 和 mvnd 命令
This commit is contained in:
BingChunMoLi 2025-08-21 00:13:14 +08:00
parent afd1b08b6d
commit 1ea20097ad
No known key found for this signature in database
GPG Key ID: E08FCE087CD04CCC
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -461,7 +461,7 @@ chsrc set rust | cargo | crate
chsrc set rustup chsrc set rustup
chsrc set go chsrc set go
chsrc set java | maven | mvn | gradle chsrc set java | maven | mvn | maven-daemon | mvnd | gradle
chsrc set clojure | clojars chsrc set clojure | clojars
chsrc set dart | pub chsrc set dart | pub
chsrc set flutter chsrc set flutter
@ -582,4 +582,4 @@ chsrc set conda | anaconda
[@Efterklang]: https://github.com/Efterklang [@Efterklang]: https://github.com/Efterklang
[@wickdynex]: https://github.com/wickdynex [@wickdynex]: https://github.com/wickdynex
[@YU-7]: https://github.com/YU-7 [@YU-7]: https://github.com/YU-7
[@sanchuanhehe]: https://github.com/sanchuanhehe [@sanchuanhehe]: https://github.com/sanchuanhehe

4
src/framework/core.c
View File

@ -607,7 +607,9 @@ measure_speed_for_url (void *url)
if (in_custom_user_agent_mode()) if (in_custom_user_agent_mode())
{ {
user_agent = strdup("maven/3.9.11"); user_agent = strdup("maven/3.9.11");
}else{ }
else
{
user_agent = xy_2strjoin("chsrc/", Chsrc_Version); user_agent = xy_2strjoin("chsrc/", Chsrc_Version);
} }
char *os_devnull = xy_os_devnull; char *os_devnull = xy_os_devnull;

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

@ -2,7 +2,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* ------------------------------------------------------------*/ * ------------------------------------------------------------*/
def_target(pl_java, "java/maven/mvn/gradle"); def_target(pl_java, "java/maven/mvn/maven-daemon/mvnd/gradle");
void void
pl_java_prelude () pl_java_prelude ()
@ -51,26 +51,26 @@ pl_java_check_cmd (bool *maven_exist, bool *gradle_exist, bool *maven_daemon_exi
} }
bool bool
chef_is_home (const char *str) pl_java_is_home (const char *str)
{ {
return (xy_str_start_with (str, "Maven home:")); return (xy_str_start_with (str, "Maven home:"));
} }
char* bool
pl_java_find_maven_home (const char *source) pl_java_find_maven_home (const char *line)
{ {
if(chef_is_home(source)) if(pl_java_is_home(line))
{ {
char *maven_home = xy_str_delete_prefix (source, "Maven home: "); return true;
} }
return false;
} }
char * char *
pl_java_find_maven_config () pl_java_find_maven_config ()
{ {
char *maven_home = 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);
maven_home = xy_str_strip (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_2strjoin (maven_home, "/conf/settings.xml"));
return maven_config; return maven_config;
} }
@ -79,10 +79,8 @@ pl_java_find_maven_config ()
char * char *
pl_java_find_maven_daemon_config () pl_java_find_maven_daemon_config ()
{ {
char *buf = 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 (buf, "Maven daemon home: "); char *maven_home = xy_str_delete_prefix (maven_home_line, "Maven home: ");
maven_home = xy_str_strip (maven_home);
char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml")); char *maven_config = xy_normalize_path (xy_2strjoin (maven_home, "/conf/settings.xml"));
return maven_config; return maven_config;
} }