Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-26 17:27:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

use deepequal for vars

Browse Source
This commit is contained in:
sawka 2022-11-02 18:45:13 -07:00
parent d4e4b497fb
commit d7b67582eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cmdrunner/cmdrunner.go
View File

@ -948,7 +948,7 @@ func CdCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (sstore.Up
return nil, err return nil, err
} }
var cmdOutput bytes.Buffer var cmdOutput bytes.Buffer
displayStateUpdate(&cmdOutput, *ids.Remote.RemoteState, remoteInst.State) displayStateUpdateDiff(&cmdOutput, *ids.Remote.RemoteState, remoteInst.State)
cmd, err := makeStaticCmd(ctx, "cd", ids, pk.GetRawStr(), cmdOutput.Bytes()) cmd, err := makeStaticCmd(ctx, "cd", ids, pk.GetRawStr(), cmdOutput.Bytes())
if err != nil { if err != nil {
// TODO tricky error since the command was a success, but we can't show the output // TODO tricky error since the command was a success, but we can't show the output
@ -1729,7 +1729,7 @@ func formatTextTable(totalCols int, data [][]string, colMeta []ColMeta) []string
return rtn return rtn
} }
func displayStateUpdate(buf *bytes.Buffer, oldState packet.ShellState, newState packet.ShellState) { func displayStateUpdateDiff(buf *bytes.Buffer, oldState packet.ShellState, newState packet.ShellState) {
if newState.Cwd != oldState.Cwd { if newState.Cwd != oldState.Cwd {
buf.WriteString(fmt.Sprintf("cwd %s\n", newState.Cwd)) buf.WriteString(fmt.Sprintf("cwd %s\n", newState.Cwd))
} }
@ -1738,7 +1738,7 @@ func displayStateUpdate(buf *bytes.Buffer, oldState packet.ShellState, newState
oldEnvMap := shexec.DeclMapFromState(&oldState) oldEnvMap := shexec.DeclMapFromState(&oldState)
for key, newVal := range newEnvMap { for key, newVal := range newEnvMap {
oldVal, found := oldEnvMap[key] oldVal, found := oldEnvMap[key]
if !found || ((oldVal.Value != newVal.Value) || (oldVal.IsExport() != newVal.IsExport())) { if !found || !shexec.DeclsEqual(oldVal, newVal) {
var exportStr string var exportStr string
if newVal.IsExport() { if newVal.IsExport() {
exportStr = "export " exportStr = "export "
@ -1802,6 +1802,6 @@ func GetRtnStateDiff(ctx context.Context, sessionId string, cmdId string) ([]byt
return nil, nil return nil, nil
} }
var outputBytes bytes.Buffer var outputBytes bytes.Buffer
displayStateUpdate(&outputBytes, cmd.RemoteState, *cmd.DonePk.FinalState) displayStateUpdateDiff(&outputBytes, cmd.RemoteState, *cmd.DonePk.FinalState)
return outputBytes.Bytes(), nil return outputBytes.Bytes(), nil
} }