Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-22 16:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge branch 'main' into ssh--auth-control

Browse Source 
This only has a few bug fixes.
This commit is contained in:
Sylvia Crowe 2024-02-09 15:07:32 -08:00
commit b788a5e4af
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/common/modals/userinput.tsx
View File

@ -1,6 +1,6 @@
import * as React from "react"; import * as React from "react";
import { GlobalModel } from "../../../models"; import { GlobalModel } from "../../../models";
import { Choose, When, If } from "tsx-control-statements"; import { Choose, When, If } from "tsx-control-statements/components";
import { Modal, PasswordField, Markdown } from "../elements"; import { Modal, PasswordField, Markdown } from "../elements";
import { UserInputRequest } from "../../../types/types"; import { UserInputRequest } from "../../../types/types";

5
waveshell/pkg/shellapi/zshapi.go
View File

@ -257,10 +257,7 @@ func (z zshShellApi) MakeRcFileStr(pk *packet.RunPacketType) string {
} }
rcBuf.WriteString("\n") rcBuf.WriteString("\n")
} }
if shellenv.FindVarDecl(varDecls, "ZDOTDIR") == nil { // do NOT unset ZDOTDIR, otherwise initialization will start to read initialization files from ~/ again
rcBuf.WriteString("unset ZDOTDIR\n")
rcBuf.WriteString("\n")
}
for _, varName := range ZshUnsetVars { for _, varName := range ZshUnsetVars {
rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n") rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n")
} }