mirror of
https://gitea.com/gitea/runner.git
synced 2026-11-05 14:55:44 +00:00
silverwind
d882311ec6
Removes dead code and redundant logic and consolidates tests, so there is less to read and maintain. No behavior change. 1. **act/runner**: inline single-use wrappers, compile regexes once instead of per call, embed the trampoline as a string, drop the unused legacy result of `parseActionCommand` 2. **act/container**: `sanitizeConfig` and `mergeContainerConfigs` stop returning the configs they already mutate in place, drop never-set option fields and the unused `user` parameter of `ExecWithCmdLine` 3. **act/common and cache server**: drop the unused `Trace`/`Tracef` loggers and the short SHA of `FindGitRevision`, `RegisterJob` releases through `RevokeJob` 4. **daemon, poller and reporter**: one shutdown wait for both poll modes, drop an unreachable fetch timeout branch, guard the reporter's last report time with its existing lock instead of an atomic 5. **build**: drop unused Makefile and release workflow variables, collapse the goreleaser ignore list to the same build targets 6. **tests**: fold near-duplicate tests into tables with shared setup Throughout, hand-rolled logic gives way to `cmp.Or`, `strings.Cut`, `slices` and `min`/`max`. Reviewed-on: https://gitea.com/gitea/runner/pulls/1335 Reviewed-by: bircni <[email protected]> Co-authored-by: silverwind <[email protected]>
90 lines
2.2 KiB
Go
90 lines
2.2 KiB
Go
//nolint:goheader // pre-existing issue from nektos/act
|
|
// Copyright 2010 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package lookpath
|
|
|
|
import (
|
|
"errors"
|
|
"io/fs"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
)
|
|
|
|
// ErrNotFound is the error resulting if a path search failed to find an executable file.
|
|
var ErrNotFound = errors.New("executable file not found in %PATH%")
|
|
|
|
func chkStat(file string) error {
|
|
d, err := os.Stat(file)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if d.IsDir() {
|
|
return fs.ErrPermission
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func hasExt(file string) bool {
|
|
return strings.LastIndex(file, ".") > strings.LastIndexAny(file, `:\/`)
|
|
}
|
|
|
|
func findExecutable(file string, exts []string) (string, error) {
|
|
if len(exts) == 0 {
|
|
return file, chkStat(file)
|
|
}
|
|
if hasExt(file) && chkStat(file) == nil {
|
|
return file, nil
|
|
}
|
|
for _, e := range exts {
|
|
if f := file + e; chkStat(f) == nil {
|
|
return f, nil
|
|
}
|
|
}
|
|
return "", fs.ErrNotExist
|
|
}
|
|
|
|
// LookPath searches for an executable named file in the
|
|
// directories named by the PATH environment variable.
|
|
// If file contains a slash, it is tried directly and the PATH is not consulted.
|
|
// LookPath also uses PATHEXT environment variable to match
|
|
// a suitable candidate.
|
|
// The result may be an absolute path or a path relative to the current directory.
|
|
func LookPath2(file string, env map[string]string) (string, error) {
|
|
var exts []string
|
|
x := getenv(env, `PATHEXT`)
|
|
if x != "" {
|
|
for e := range strings.SplitSeq(strings.ToLower(x), `;`) {
|
|
if e == "" {
|
|
continue
|
|
}
|
|
if e[0] != '.' {
|
|
e = "." + e
|
|
}
|
|
exts = append(exts, e)
|
|
}
|
|
} else {
|
|
exts = []string{".com", ".exe", ".bat", ".cmd"}
|
|
}
|
|
|
|
if strings.ContainsAny(file, `:\/`) {
|
|
if f, err := findExecutable(file, exts); err == nil {
|
|
return f, nil
|
|
} else {
|
|
return "", &Error{file, err}
|
|
}
|
|
}
|
|
if f, err := findExecutable(filepath.Join(".", file), exts); err == nil {
|
|
return f, nil
|
|
}
|
|
path := getenv(env, "path")
|
|
for _, dir := range filepath.SplitList(path) {
|
|
if f, err := findExecutable(filepath.Join(dir, file), exts); err == nil {
|
|
return f, nil
|
|
}
|
|
}
|
|
return "", &Error{file, ErrNotFound}
|
|
}
|