Commit 82be07f

committed

fix: Env PATH fetch and find exec file not works in windows

1 parent b347e8c commit 82be07fCopy full SHA for 82be07f

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -248,13 +248,19 @@ public static function getCpuNum(): int`
`248`	`248`	`*/`
`249`	`249`	`public static function findExecutable(string $name, array $paths = []): string`
`250`	`250`	`{`
	`251`	`+ $isWin = self::isWindows();`
`251`	`252`	`$paths = $paths ?: self::getEnvPaths();`
`252`	`253`
`253`	`254`	`foreach ($paths as $path) {`
`254`	`255`	`$filename = $path . DIRECTORY_SEPARATOR . $name;`
`255`	`256`	`if (is_file($filename)) {`
`256`	`257`	`return $filename;`
`257`	`258`	`}`
	`259`	`+`
	`260`	`+ // maybe is exe file`
	`261`	`+ if ($isWin && is_file($filename . '.exe')) {`
	`262`	`+ return $filename . '.exe';`
	`263`	`+ }`
`258`	`264`	`}`
`259`	`265`	`return "";`
`260`	`266`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public static function setEnv(string $key, int\|string $value): bool`
`80`	`80`	`*/`
`81`	`81`	`public static function getEnvPaths(): array`
`82`	`82`	`{`
`83`		`- $pathStr = $_SERVER['PATH'] ?? '';`
	`83`	`+ $pathStr = $_SERVER['PATH'] ?? ($_SERVER['Path'] ?? '');`
`84`	`84`	`if (!$pathStr) {`
`85`	`85`	`return [];`
`86`	`86`	`}`

Comments

(0)