Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-04 18:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: run waveshell remotely with chosen shell

Browse Source 
This ensures that the appropriate shell is used to run the waveshell
command remotely. It hasn't made a difference in my experience but is
desired in order to match the local launch.
This commit is contained in:
Sylvia Crowe 2024-03-01 00:37:03 -08:00
parent 69d49343c7
commit 5dfb8a816f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wavesrv/pkg/remote/remote.go
View File

@ -1549,13 +1549,15 @@ func (msh *MShellProc) createWaveshellSession(remoteCopy sstore.RemoteType) (she
if err != nil { if err != nil {
return nil, fmt.Errorf("ssh cannot create session: %w", err) return nil, fmt.Errorf("ssh cannot create session: %w", err)
} }
wsSession = shexec.SessionWrap{Session: session, StartCmd: MakeServerCommandStr()} cmd := fmt.Sprintf("%s -c %s", sapi.GetLocalShellPath(), shellescape.Quote(MakeServerCommandStr()))
wsSession = shexec.SessionWrap{Session: session, StartCmd: cmd}
} else { } else {
session, err := msh.Client.NewSession() session, err := msh.Client.NewSession()
if err != nil { if err != nil {
return nil, fmt.Errorf("ssh cannot create session: %w", err) return nil, fmt.Errorf("ssh cannot create session: %w", err)
} }
wsSession = shexec.SessionWrap{Session: session, StartCmd: MakeServerCommandStr()} cmd := fmt.Sprintf(`%s -c %s`, sapi.GetLocalShellPath(), shellescape.Quote(MakeServerCommandStr()))
wsSession = shexec.SessionWrap{Session: session, StartCmd: cmd}
} }
return wsSession, nil return wsSession, nil
} }