GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-28 03:30:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: group environments

Browse Source
This commit is contained in:
debugtalk
2022-10-11 11:12:28 +08:00
parent 9b1f7d2d07
commit c2679a1508
8 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/internal/builtin/utils.go
+3 -2
View File
@@ -20,6 +20,7 @@ import (
"github.com/rs/zerolog/log"
"gopkg.in/yaml.v3"
"github.com/httprunner/httprunner/v4/hrp/internal/env"
"github.com/httprunner/httprunner/v4/hrp/internal/json"
)
@@ -170,7 +171,7 @@ func InstallPythonPackage(python3 string, pkg string) (err error) {
log.Info().Str("pkgName", pkgName).Str("pkgVersion", pkgVersion).Msg("installing python package")
// install package
pypiIndexURL := os.Getenv("PYPI_INDEX_URL")
pypiIndexURL := env.PYPI_INDEX_URL
if pypiIndexURL == "" {
pypiIndexURL = "https://pypi.org/simple" // default
}
@@ -494,7 +495,7 @@ func GetFileNameWithoutExtension(path string) string {
}
func Bytes2File(data []byte, filename string) error {
file, err := os.OpenFile(filename, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0755)
file, err := os.OpenFile(filename, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0o755)
defer file.Close()
if err != nil {
log.Error().Err(err).Msg("failed to generate file")
hrp/internal/builtin/utils_unix.go
+3 -1
View File
@@ -11,6 +11,8 @@ import (
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
"github.com/httprunner/httprunner/v4/hrp/internal/env"
)
func isPython3(python string) bool {
@@ -80,7 +82,7 @@ func ExecCommand(cmdName string, args ...string) error {
// add cmd dir path to $PATH
if cmdDir := filepath.Dir(cmdName); cmdDir != "" {
PATH := fmt.Sprintf("%s:%s", cmdDir, os.Getenv("PATH"))
PATH := fmt.Sprintf("%s:%s", cmdDir, env.PATH)
if err := os.Setenv("PATH", PATH); err != nil {
log.Error().Err(err).Msg("set env $PATH failed")
return err