Skip to content

Commit ec07b17

Browse files
authored
pull cmd:env and initscripts into wave terminals (#1793)
1 parent 286783f commit ec07b17

14 files changed

Lines changed: 356 additions & 166 deletions

File tree

cmd/wsh/cmd/wshcmd-run.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111

1212
"github.com/spf13/cobra"
1313
"github.com/wavetermdev/waveterm/pkg/util/envutil"
14+
"github.com/wavetermdev/waveterm/pkg/wavebase"
1415
"github.com/wavetermdev/waveterm/pkg/waveobj"
1516
"github.com/wavetermdev/waveterm/pkg/wshrpc"
1617
"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
@@ -136,7 +137,7 @@ func runRun(cmd *cobra.Command, args []string) (rtnErr error) {
136137
BlockDef: &waveobj.BlockDef{
137138
Meta: createMeta,
138139
Files: map[string]*waveobj.FileDef{
139-
"env": {
140+
wavebase.BlockFile_Env: {
140141
Content: envContent,
141142
},
142143
},

frontend/types/gotypes.d.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,11 +499,18 @@ declare global {
499499
"cmd:closeonexit"?: boolean;
500500
"cmd:closeonexitforce"?: boolean;
501501
"cmd:closeonexitdelay"?: number;
502-
"cmd:env"?: {[key: string]: string};
503-
"cmd:cwd"?: string;
504502
"cmd:nowsh"?: boolean;
505503
"cmd:args"?: string[];
506504
"cmd:shell"?: boolean;
505+
"cmd:allowconnchange"?: boolean;
506+
"cmd:env"?: {[key: string]: string};
507+
"cmd:cwd"?: string;
508+
"cmd:initscript"?: string;
509+
"cmd:initscript.sh"?: string;
510+
"cmd:initscript.bash"?: string;
511+
"cmd:initscript.zsh"?: string;
512+
"cmd:initscript.pwsh"?: string;
513+
"cmd:initscript.fish"?: string;
507514
"ai:*"?: boolean;
508515
"ai:preset"?: string;
509516
"ai:apitype"?: string;

0 commit comments

Comments
 (0)