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

autoinstall, fix version check

Browse Source
This commit is contained in:
sawka 2022-09-24 22:42:52 -07:00
parent 982d600d9b
commit bf4fa2031b
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmdrunner/cmdrunner.go
View File

@ -473,6 +473,7 @@ func RemoteNewCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ss
if !sstore.IsValidConnectMode(connectMode) {
return nil, fmt.Errorf("/remote:new invalid connectmode %q: valid modes are %s", connectMode, formatStrs([]string{sstore.ConnectModeStartup, sstore.ConnectModeAuto, sstore.ConnectModeManual}, "or", false))
}
autoInstall := resolveBool(pk.Kwargs["autoinstall"], true)
var isSudo bool
if sudoStr != "" {
isSudo = true
@ -522,6 +523,7 @@ func RemoteNewCommand(ctx context.Context, pk *scpacket.FeCommandPacketType) (ss
RemoteUser: remoteUser,
RemoteHost: remoteHost,
ConnectMode: connectMode,
AutoInstall: autoInstall,
SSHOpts: sshOpts,
RemoteOpts: remoteOpts,
}

2
pkg/remote/remote.go
View File

@ -678,7 +678,7 @@ func (msh *MShellProc) Launch() {
if err == context.Canceled {
err = fmt.Errorf("forced disconnection")
}
if semver.MajorMinor(mshellVersion) != semver.MajorMinor(MShellVersion) {
if err == nil && semver.MajorMinor(mshellVersion) != semver.MajorMinor(MShellVersion) {
err = fmt.Errorf("mshell version is not compatible current=%s remote=%s", MShellVersion, mshellVersion)
}
if err != nil {

4
pkg/sstore/dbops.go
View File

@ -127,8 +127,8 @@ func UpsertRemote(ctx context.Context, r *RemoteType) error {
maxRemoteIdx := tx.GetInt(query)
r.RemoteIdx = int64(maxRemoteIdx + 1)
query = `INSERT INTO remote
( remoteid, physicalid, remotetype, remotealias, remotecanonicalname, remotesudo, remoteuser, remotehost, connectmode, initpk, sshopts, remoteopts, lastconnectts, archived, remoteidx) VALUES
(:remoteid,:physicalid,:remotetype,:remotealias,:remotecanonicalname,:remotesudo,:remoteuser,:remotehost,:connectmode,:initpk,:sshopts,:remoteopts,:lastconnectts,:archived,:remoteidx)`
( remoteid, physicalid, remotetype, remotealias, remotecanonicalname, remotesudo, remoteuser, remotehost, connectmode, autoinstall, initpk, sshopts, remoteopts, lastconnectts, archived, remoteidx) VALUES
(:remoteid,:physicalid,:remotetype,:remotealias,:remotecanonicalname,:remotesudo,:remoteuser,:remotehost,:connectmode,:autoinstall,:initpk,:sshopts,:remoteopts,:lastconnectts,:archived,:remoteidx)`
tx.NamedExecWrap(query, r.ToMap())
return nil
})

3
pkg/sstore/sstore.go
View File

@ -681,6 +681,7 @@ func EnsureLocalRemote(ctx context.Context) error {
RemoteUser: user.Username,
RemoteHost: hostName,
ConnectMode: ConnectModeStartup,
AutoInstall: true,
SSHOpts: &SSHOpts{Local: true},
}
err = UpsertRemote(ctx, localRemote)
@ -714,6 +715,7 @@ func AddTest01Remote(ctx context.Context) error {
SSHIdentity: "/Users/mike/aws/mfmt.pem",
},
ConnectMode: ConnectModeStartup,
AutoInstall: true,
}
err = UpsertRemote(ctx, testRemote)
if err != nil {
@ -745,6 +747,7 @@ func AddTest02Remote(ctx context.Context) error {
SSHUser: "test2",
},
ConnectMode: ConnectModeStartup,
AutoInstall: true,
}
err = UpsertRemote(ctx, testRemote)
if err != nil {