wsh => wave

pkg/remote/connutil.go

@@ -95,6 +95,7 @@ mkdir -p {{.installDir}} || exit 1;
 cat > {{.tempPath}} || exit 1;
 mv {{.tempPath}} {{.installPath}} || exit 1;
 chmod a+x {{.installPath}} || exit 1;
+cp {{.installPath}} {{.wavePath}} || exit 1;
 `)
 var installTemplate = template.Must(template.New("wsh-install-template").Parse(installTemplateRawDefault))
 
@@ -116,6 +117,7 @@ func CpWshToRemote(ctx context.Context, client *ssh.Client, clientOs string, cli
 		"installDir":  filepath.ToSlash(filepath.Dir(wavebase.RemoteFullWshBinPath)),
 		"tempPath":    wavebase.RemoteFullWshBinPath + ".temp",
 		"installPath": wavebase.RemoteFullWshBinPath,
+		"wavePath":    wavebase.RemoteFullWaveBinPath,
 	}
 	var installCmd bytes.Buffer
 	if err := installTemplate.Execute(&installCmd, installWords); err != nil {

pkg/util/shellutil/shellutil.go

@@ -409,15 +409,21 @@ func initCustomShellStartupFilesInternal() error {
 		return nil
 	}
 	wshDstPath := filepath.Join(binDir, "wsh")
+	waveDstPath := filepath.Join(binDir, "wave")
 	if runtime.GOOS == "windows" {
 		wshDstPath = wshDstPath + ".exe"
+		waveDstPath = waveDstPath + ".exe"
 	}
 	err = utilfn.AtomicRenameCopy(wshDstPath, wshFullPath, 0755)
 	if err != nil {
 		return fmt.Errorf("error copying wsh binary to bin: %v", err)
 	}
+	err = utilfn.AtomicRenameCopy(waveDstPath, wshFullPath, 0755)
+	if err != nil {
+		return fmt.Errorf("error copying wave binary to bin: %v", err)
+	}
 	wshBaseName := filepath.Base(wshFullPath)
-	log.Printf("wsh binary successfully copied from %q to %q\n", wshBaseName, wshDstPath)
+	log.Printf("wsh binary successfully copied from %q to %q and %q\n", wshBaseName, wshDstPath, waveDstPath)
 	return nil
 }
 

pkg/wavebase/wavebase.go

@@ -62,6 +62,7 @@ const ConfigDir = "config"
 const RemoteWaveHomeDirName = ".waveterm"
 const RemoteWshBinDirName = "bin"
 const RemoteFullWshBinPath = "~/.waveterm/bin/wsh"
+const RemoteFullWaveBinPath = "~/.waveterm/bin/wave"
 const RemoteFullDomainSocketPath = "~/.waveterm/wave-remote.sock"
 
 const AppPathBinDir = "bin"

pkg/wslconn/wsl-util.go

@@ -105,13 +105,15 @@ var installTemplatesRawBash = map[string]string{
 	"cat":   `bash -c 'cat > {{.tempPath}}'`,
 	"mv":    `bash -c 'mv {{.tempPath}} {{.installPath}}'`,
 	"chmod": `bash -c 'chmod a+x {{.installPath}}'`,
+	"cp":    `bash -c 'cp {{.installPath}} {{.wavePath}}'`,
 }
 
 var installTemplatesRawDefault = map[string]string{
 	"mkdir": `mkdir -p {{.installDir}}`,
 	"cat":   `cat > {{.tempPath}}`,
 	"mv":    `mv {{.tempPath}} {{.installPath}}`,
 	"chmod": `chmod a+x {{.installPath}}`,
+	"cp":    `cp {{.installPath}} {{.wavePath}}`,
 }
 
 func makeCancellableCommand(ctx context.Context, client *wsl.Distro, cmdTemplateRaw string, words map[string]string) (*CancellableCmd, error) {
@@ -154,6 +156,7 @@ func CpWshToRemote(ctx context.Context, client *wsl.Distro, clientOs string, cli
 		"installDir":  filepath.ToSlash(filepath.Dir(wavebase.RemoteFullWshBinPath)),
 		"tempPath":    wavebase.RemoteFullWshBinPath + ".temp",
 		"installPath": wavebase.RemoteFullWshBinPath,
+		"wavePath":    wavebase.RemoteFullWaveBinPath,
 	}
 
 	blocklogger.Infof(ctx, "[conndebug] copying %q to remote server %q\n", wshLocalPath, wavebase.RemoteFullWshBinPath)
@@ -216,6 +219,11 @@ func CpWshToRemote(ctx context.Context, client *wsl.Distro, clientOs string, cli
 		return err
 	}
 
+	_, err = installStepCmds["cp"].Cmd.Output()
+	if err != nil {
+		return err
+	}
+
 	return nil
 }