X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-cli.git;a=blobdiff_plain;f=cmd-exec.go;h=d5b6466163e63ad45e997ff87cc19c5a864deb0a;hp=612851f524d0452755ede3fff2677dc72b414a4a;hb=0df439bb10fe1f178b32aff8467e9671888eac4b;hpb=c35d7a0fc8bbb1f9123bb41a7b66e45ea2564dd2 diff --git a/cmd-exec.go b/cmd-exec.go index 612851f..d5b6466 100644 --- a/cmd-exec.go +++ b/cmd-exec.go @@ -6,8 +6,6 @@ import ( "strings" "github.com/iotbzh/xds-agent/lib/apiv1" - common "github.com/iotbzh/xds-common/golib" - "github.com/joho/godotenv" "github.com/urfave/cli" ) @@ -38,7 +36,6 @@ func initCmdExec(cmdDef *[]cli.Command) { func exec(ctx *cli.Context) error { prjID := ctx.String("id") - confFile := ctx.String("config") rPath := ctx.String("rPath") sdkid := ctx.String("sdkid") @@ -47,23 +44,6 @@ func exec(ctx *cli.Context) error { return cli.NewExitError("project id must be set (see --id option)", 1) } - // Load config file if requested - envMap := make(map[string]string) - if confFile != "" { - if !common.Exists(confFile) { - exitError(1, "Error env config file not found") - } - // Load config file variables that will overwrite env variables - err := godotenv.Overload(confFile) - if err != nil { - exitError(1, "Error loading env config file "+confFile) - } - envMap, err = godotenv.Read(confFile) - if err != nil { - exitError(1, "Error reading env config file "+confFile) - } - } - argsCommand := make([]string, len(ctx.Args())) copy(argsCommand, ctx.Args()) Log.Infof("Execute: /exec %v", argsCommand) @@ -128,9 +108,9 @@ func exec(ctx *cli.Context) error { } // Build env - Log.Debugf("Command env: %v", envMap) + Log.Debugf("Command env: %v", EnvConfFileMap) env := []string{} - for k, v := range envMap { + for k, v := range EnvConfFileMap { env = append(env, k+"="+v) }