`chsrc_view_env` 运行时检测系统
Some checks are pending
Publish 'chsrc-git' to AUR / publish (push) Waiting to run

This commit is contained in:
Aoran Zeng 2025-12-29 18:34:31 +08:00
parent 6418b1557f
commit 7fd79ea284
No known key found for this signature in database
GPG Key ID: 8F8BA8488E10ED98
3 changed files with 32 additions and 25 deletions

View File

@ -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 *);
}

View File

@ -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"

View File

@ -1,10 +1,10 @@
/** ------------------------------------------------------------
* SPDX-License-Identifier: GPL-3.0-or-later
* -------------------------------------------------------------
* File Authors : <ccmywish@qq.com>
* Contributors : Mikachu2333 <mikachu.23333@zohomail.com>
* 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");
}