提交 addb29fa 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

test on windows

上级 3e0d51f1
......@@ -32,7 +32,7 @@ func generateBinData(convertFile string) (content, pth string) {
phpExeFile := "php"
if commonUtils.IsWin() { // use build-in php runtime
phpExeFile = filepath.Join(vari.ZdPath, "runtime", "php7", "php.exe")
phpExeFile = filepath.Join(vari.ZdPath, "runtime", "php", "php7", "php.exe")
}
cmdStr := phpExeFile + " convert.php"
out, _ := shellUtils.ExecInDir(cmdStr, dir)
......
......@@ -45,11 +45,11 @@ func GetOs() string {
if osName == "darwin" {
return "mac"
} else {
return osName
return strings.Replace(osName, "windows", "win", 1)
}
}
func IsWin() bool {
return GetOs() == "windows"
return GetOs() == "win"
}
func IsLinux() bool {
return GetOs() == "linux"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册