wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkg/utils: Streamline functions

Browse source 
https://github.com/containers/toolbox/pull/847
This commit is contained in:
Ondřej Míchal 2021-07-21 20:19:45 +02:00
parent 1f0c6d5100
commit d9147fff8c
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pkg/utils/utils.go
View file

@ -209,10 +209,10 @@ func CreateErrorInvalidRelease(executableBase string) error {
}
func EnsureXdgRuntimeDirIsSet(uid int) {
if xdgRuntimeDir, ok := os.LookupEnv("XDG_RUNTIME_DIR"); !ok {
if _, ok := os.LookupEnv("XDG_RUNTIME_DIR"); !ok {
logrus.Debug("XDG_RUNTIME_DIR is unset")
xdgRuntimeDir = fmt.Sprintf("/run/user/%d", uid)
xdgRuntimeDir := fmt.Sprintf("/run/user/%d", uid)
os.Setenv("XDG_RUNTIME_DIR", xdgRuntimeDir)
logrus.Debugf("XDG_RUNTIME_DIR set to %s", xdgRuntimeDir)
@ -653,19 +653,11 @@ func IsContainerNameValid(containerName string) bool {
}
func IsInsideContainer() bool {
if PathExists("/run/.containerenv") {
return true
}
return false
return PathExists("/run/.containerenv")
}
func IsInsideToolboxContainer() bool {
if PathExists("/run/.toolboxenv") {
return true
}
return false
return PathExists("/run/.toolboxenv")
}
// ResolveContainerName standardizes the name of a container