diff --git a/src/framework/core.c b/src/framework/core.c index 13b475b..023f01c 100644 --- a/src/framework/core.c +++ b/src/framework/core.c @@ -1648,27 +1648,30 @@ chsrc_view_env (const char *var1, ...) bool first = true; while (var) { -#ifdef XY_Build_On_Windows - if (first) + if (xy.on_windows) { - cmd = xy_strcat (3, "set ", var, " "); - first = false; + if (first) + { + cmd = xy_strcat (3, "set ", var, " "); + first = false; + } + else + { + cmd = xy_strcat (4, cmd, "& set ", var, " "); + } } else - { - cmd = xy_strcat (4, cmd, "& set ", var, " "); + { + if (first) + { + cmd = xy_strcat (5, "echo ", var, "=$", var, " "); + first = false; + } + else + { + cmd = xy_strcat (6, cmd, "; echo ", var, "=$", var, " "); + } } -#else - if (first) - { - cmd = xy_strcat (5, "echo ", var, "=$", var, " "); - first = false; - } - else - { - cmd = xy_strcat (6, cmd, "; echo ", var, "=$", var, " "); - } -#endif var = va_arg (vars, const char *); } diff --git a/src/framework/version.h b/src/framework/version.h index da057c6..8fce94b 100644 --- a/src/framework/version.h +++ b/src/framework/version.h @@ -12,12 +12,12 @@ * 发布新版本前请修改此文件 * ------------------------------------------------------------*/ -#define Chsrc_Version "0.2.3.4" +#define Chsrc_Version "0.2.4.0-dev" // 以下四个宏仅用于 resource/chsrc.rc #define Chsrc_Version_Major 0 #define Chsrc_Version_Minor 2 -#define Chsrc_Version_Patch 3 -#define Chsrc_Version_Pre 4 +#define Chsrc_Version_Patch 4 +#define Chsrc_Version_Pre 0 -#define Chsrc_Release_Date "2025/12/18" +#define Chsrc_Release_Date "2025/12/29" diff --git a/test/fw.c b/test/fw.c index 112bdce..7c13c38 100644 --- a/test/fw.c +++ b/test/fw.c @@ -1,10 +1,10 @@ /** ------------------------------------------------------------ * SPDX-License-Identifier: GPL-3.0-or-later * ------------------------------------------------------------- - * File Authors : 曾奥然 - * Contributors : Mikachu2333 + * File Authors : @ccmywish + * Contributors : @Mikachu2333 * Created On : <2024-12-14> - * Last Modified : <2025-10-06> + * Last Modified : <2025-12-29> * * 该文件最好启用 DEBUG mode 编译 * ------------------------------------------------------------*/ @@ -85,10 +85,14 @@ main (int argc, char const *argv[]) if (xy.on_windows) { - chsrc_run_as_pwsh_file ("Write-Host \"Hello from PowerShell file\""); + chsrc_view_env ("OS", "windir", NULL); + chsrc_run_as_pwsh_file ("Write-Host \"Hello from PowerShell (v7) file\""); + chsrc_run_as_powershellv5_file ("Write-Host \"Hello from PowerShell v5 file\""); + chsrc_run_as_powershell_file ("Write-Host \"Hello from PowerShell file\""); } else { + chsrc_view_env ("PWD", NULL); chsrc_run_as_sh_file ("echo Hello from sh file"); chsrc_run_as_bash_file ("echo Hello from Bash file"); }