Skip to content

pull cmd:env and initscripts into wave terminals #1793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sawka merged 8 commits into from
Jan 23, 2025
Merged

pull cmd:env and initscripts into wave terminals #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
304f4bc
new meta keys to control initscript/env. working on conn overrides
sawka Jan 20, 2025
c2ee2e9
Merge remote-tracking branch 'origin/main' into sawka/initscript
sawka Jan 20, 2025
021f00b
remove cmdOpts.Env, add to swaptoken. use swaptoken for wsl. implem…
sawka Jan 21, 2025
05de49f
simplify GetConn calls, connunion set up, fix some nowsh flags
sawka Jan 21, 2025
90a57d5
blockUnion, get shelltype, compute initscript, pass through with swap…
sawka Jan 21, 2025
3674ad9
remove restored terminal state message. also fix the blockfile append
sawka Jan 22, 2025
31db6a2
merge main
sawka Jan 22, 2025
629b978
better casting logic
sawka Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/wsh/cmd/wshcmd-run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

"github.com/spf13/cobra"
"github.com/wavetermdev/waveterm/pkg/util/envutil"
"github.com/wavetermdev/waveterm/pkg/wavebase"
"github.com/wavetermdev/waveterm/pkg/waveobj"
"github.com/wavetermdev/waveterm/pkg/wshrpc"
"github.com/wavetermdev/waveterm/pkg/wshrpc/wshclient"
Expand Down Expand Up @@ -136,7 +137,7 @@ func runRun(cmd *cobra.Command, args []string) (rtnErr error) {
BlockDef: &waveobj.BlockDef{
Meta: createMeta,
Files: map[string]*waveobj.FileDef{
"env": {
wavebase.BlockFile_Env: {
Content: envContent,
},
},
Expand Down
11 changes: 9 additions & 2 deletions frontend/types/gotypes.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,18 @@ declare global {
"cmd:closeonexit"?: boolean;
"cmd:closeonexitforce"?: boolean;
"cmd:closeonexitdelay"?: number;
"cmd:env"?: {[key: string]: string};
"cmd:cwd"?: string;
"cmd:nowsh"?: boolean;
"cmd:args"?: string[];
"cmd:shell"?: boolean;
"cmd:allowconnchange"?: boolean;
"cmd:env"?: {[key: string]: string};
"cmd:cwd"?: string;
"cmd:initscript"?: string;
"cmd:initscript.sh"?: string;
"cmd:initscript.bash"?: string;
"cmd:initscript.zsh"?: string;
"cmd:initscript.pwsh"?: string;
"cmd:initscript.fish"?: string;
"ai:*"?: boolean;
"ai:preset"?: string;
"ai:apitype"?: string;
Expand Down
Loading
Loading