waveterm/backup
0
0
Fork 0
mirror of https://github.com/wavetermdev/backup.git synced 2026-08-05 13:57:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

rename env to env0. add envcomplete bool

Browse Source
This commit is contained in:
sawka
2022-08-22 16:24:53 -07:00
parent e26705623b
commit 7d06bc766c
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/packet/packet.go
+13 -12
View File
@@ -438,7 +438,7 @@ type InitPacketType struct {
MShellHomeDir string `json:"mshellhomedir,omitempty"`
HomeDir string `json:"homedir,omitempty"`
Cwd string `json:"cwd,omitempty"`
Env []byte `json:"env,omitempty"` // "env -0" format
Env0 []byte `json:"env0,omitempty"` // "env -0" format
User string `json:"user,omitempty"`
HostName string `json:"hostname,omitempty"`
NotFound bool `json:"notfound,omitempty"`
@@ -532,17 +532,18 @@ type RunDataType struct {
}
type RunPacketType struct {
Type string `json:"type"`
ReqId string `json:"reqid"`
CK base.CommandKey `json:"ck"`
Command string `json:"command"`
Cwd string `json:"cwd,omitempty"`
Env map[string]string `json:"env,omitempty"`
UsePty bool `json:"usepty,omitempty"`
TermOpts *TermOpts `json:"termopts,omitempty"`
Fds []RemoteFd `json:"fds,omitempty"`
RunData []RunDataType `json:"rundata,omitempty"`
Detached bool `json:"detached,omitempty"`
Type string `json:"type"`
ReqId string `json:"reqid"`
CK base.CommandKey `json:"ck"`
Command string `json:"command"`
Cwd string `json:"cwd,omitempty"`
Env0 []byte `json:"env0,omitempty"` // in "env -0" format
EnvComplete bool `json:"envcomplete,omitempty"` // set to true if env0 is complete (the default env should not be set)
UsePty bool `json:"usepty,omitempty"`
TermOpts *TermOpts `json:"termopts,omitempty"`
Fds []RemoteFd `json:"fds,omitempty"`
RunData []RunDataType `json:"rundata,omitempty"`
Detached bool `json:"detached,omitempty"`
}
func (*RunPacketType) GetType() string {
pkg/shexec/shexec.go
+10 -7
View File
@@ -159,9 +159,6 @@ func UpdateCmdEnv(cmd *exec.Cmd, envVars map[string]string) {
if len(envVars) == 0 {
return
}
if cmd.Env == nil {
cmd.Env = os.Environ()
}
found := make(map[string]bool)
var newEnv []string
for _, envStr := range cmd.Env {
@@ -201,7 +198,10 @@ func MakeSimpleStaticWriterPipe(data []byte) (*os.File, error) {
func MakeDetachedExecCmd(pk *packet.RunPacketType, cmdTty *os.File) (*exec.Cmd, error) {
ecmd := exec.Command("bash", "-c", pk.Command)
UpdateCmdEnv(ecmd, pk.Env)
if !pk.EnvComplete {
ecmd.Env = os.Environ()
}
UpdateCmdEnv(ecmd, parseEnv0(pk.Env0))
UpdateCmdEnv(ecmd, map[string]string{"TERM": getTermType(pk)})
if pk.Cwd != "" {
ecmd.Dir = base.ExpandHomeDir(pk.Cwd)
@@ -828,7 +828,10 @@ func getTermType(pk *packet.RunPacketType) string {
func RunCommandSimple(pk *packet.RunPacketType, sender *packet.PacketSender) (*ShExecType, error) {
cmd := MakeShExec(pk.CK, nil)
cmd.Cmd = exec.Command("bash", "-c", pk.Command)
UpdateCmdEnv(cmd.Cmd, pk.Env)
if !pk.EnvComplete {
cmd.Cmd.Env = os.Environ()
}
UpdateCmdEnv(cmd.Cmd, parseEnv0(pk.Env0))
if pk.Cwd != "" {
cmd.Cmd.Dir = base.ExpandHomeDir(pk.Cwd)
}
@@ -1104,7 +1107,7 @@ func MakeServerInitPacket() (*packet.InitPacketType, error) {
return nil, err
}
initPacket.Cwd = cwd
initPacket.Env = env
initPacket.Env0 = env
initPacket.RemoteId, err = base.GetRemoteId()
if err != nil {
return nil, err
@@ -1112,7 +1115,7 @@ func MakeServerInitPacket() (*packet.InitPacketType, error) {
return initPacket, nil
}
func parseEnv(env []byte) map[string]string {
func parseEnv0(env []byte) map[string]string {
envLines := bytes.Split(env, []byte{0})
rtn := make(map[string]string)
for _, envLine := range envLines {