diff --git a/base/cli/cli.go b/base/cli/cli.go index 770bc300..1a693976 100644 --- a/base/cli/cli.go +++ b/base/cli/cli.go @@ -52,7 +52,7 @@ var Index = &ice.Context{Name: "cli", Help: "命令模块", // 启动信息 m.Conf(RUNTIME, "boot.username", kit.Select(os.Getenv("USER"), os.Getenv("ctx_user"))) if user, e := user.Current(); e == nil && user.Name != "" { - m.Conf(RUNTIME, "boot.username", user.Name) + m.Conf(RUNTIME, "boot.username", kit.Select(user.Name, os.Getenv("ctx_user"))) } if name, e := os.Hostname(); e == nil { m.Conf(RUNTIME, "boot.hostname", kit.Select(name, os.Getenv("HOSTNAME"))) diff --git a/misc/docker/docker.go b/misc/docker/docker.go index 9a09d707..43209051 100644 --- a/misc/docker/docker.go +++ b/misc/docker/docker.go @@ -139,7 +139,7 @@ var Index = &ice.Context{Name: "docker", Help: "虚拟机", p = path.Join(p, ".bashrc") if _, e := os.Stat(p); e != nil { - m.Cmd(nfs.SAVE, p, kit.Format("export ctx_dev=%s\nexport ctx_pod=%s ctx_user=%s\n", + m.Cmd(nfs.SAVE, p, kit.Format("export ctx_dev=%s export ctx_pod=%s ctx_user=%s\n", m.Conf(cli.RUNTIME, "conf.ctx_dev"), arg[0], cli.UserName)) }