summaryrefslogtreecommitdiff
path: root/pkg/env
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/env')
-rw-r--r--pkg/env/env.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/env/env.go b/pkg/env/env.go
index 31ffab03c..c6a1a0d28 100644
--- a/pkg/env/env.go
+++ b/pkg/env/env.go
@@ -12,11 +12,10 @@ import (
"github.com/pkg/errors"
)
-// DefaultEnvVariables set $PATH, $TERM and $container.
+// DefaultEnvVariables sets $PATH and $TERM.
var DefaultEnvVariables = map[string]string{
- "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
- "TERM": "xterm",
- "container": "podman",
+ "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
+ "TERM": "xterm",
}
const whiteSpaces = " \t"
@@ -62,7 +61,8 @@ func Join(base map[string]string, override map[string]string) map[string]string
// ParseFile parses the specified path for environment variables and returns them
// as a map.
-func ParseFile(path string) (env map[string]string, err error) {
+func ParseFile(path string) (_ map[string]string, err error) {
+ env := make(map[string]string)
defer func() {
if err != nil {
err = errors.Wrapf(err, "error parsing env file %q", path)