mirror of
https://github.com/wavetermdev/backup.git
synced 2026-08-05 13:57:07 -07:00
Rename Waveshell First Pass (#632)
This begins the process of renaming mshell to waveshell everywhere by making the most simple changes. There will need to be additional changes in the future, but the hope is to merge simple changes in now to reduce the number of future merge conflicts.
This commit is contained in:
@@ -170,8 +170,8 @@ type WaveshellLaunchError struct {
|
||||
func (wle WaveshellLaunchError) Error() string {
|
||||
if wle.InitPk.NotFound {
|
||||
return "waveshell client not found"
|
||||
} else if semver.MajorMinor(wle.InitPk.Version) != semver.MajorMinor(base.MShellVersion) {
|
||||
return fmt.Sprintf("invalid remote waveshell version '%s', must be '=%s'", wle.InitPk.Version, semver.MajorMinor(base.MShellVersion))
|
||||
} else if semver.MajorMinor(wle.InitPk.Version) != semver.MajorMinor(base.WaveshellVersion) {
|
||||
return fmt.Sprintf("invalid remote waveshell version '%s', must be '=%s'", wle.InitPk.Version, semver.MajorMinor(base.WaveshellVersion))
|
||||
}
|
||||
return fmt.Sprintf("invalid waveshell: init packet=%v", *wle.InitPk)
|
||||
}
|
||||
@@ -232,7 +232,7 @@ func MakeClientProc(ctx context.Context, ecmd ConnInterface) (*ClientProc, error
|
||||
cproc.Close()
|
||||
return nil, WaveshellLaunchError{InitPk: initPk}
|
||||
}
|
||||
if semver.MajorMinor(initPk.Version) != semver.MajorMinor(base.MShellVersion) {
|
||||
if semver.MajorMinor(initPk.Version) != semver.MajorMinor(base.WaveshellVersion) {
|
||||
cproc.Close()
|
||||
return nil, WaveshellLaunchError{InitPk: initPk}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user