625b1578fa
Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
29 lines
502 B
Go
29 lines
502 B
Go
// +build windows
|
|
|
|
package shellwords
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
)
|
|
|
|
func shellRun(line, dir string) (string, error) {
|
|
var shell string
|
|
if shell = os.Getenv("COMSPEC"); shell == "" {
|
|
shell = "cmd"
|
|
}
|
|
cmd := exec.Command(shell, "/c", line)
|
|
if dir != "" {
|
|
cmd.Dir = dir
|
|
}
|
|
b, err := cmd.Output()
|
|
if err != nil {
|
|
if eerr, ok := err.(*exec.ExitError); ok {
|
|
b = eerr.Stderr
|
|
}
|
|
return "", fmt.Errorf("%s: %w", string(b), err)
|
|
}
|
|
return strings.TrimSpace(string(b)), nil
|
|
}
|