backport zdotdir fix to v0.6.x release

sawka · sawka · commit 592e023441b4 · 2024-02-10T19:34:56.000-03:00
diff --git a/waveshell/pkg/shellapi/zshapi.go b/waveshell/pkg/shellapi/zshapi.go
@@ -257,10 +257,7 @@ func (z zshShellApi) MakeRcFileStr(pk *packet.RunPacketType) string {
 		}
 		rcBuf.WriteString("\n")
 	}
-	if shellenv.FindVarDecl(varDecls, "ZDOTDIR") == nil {
-		rcBuf.WriteString("unset ZDOTDIR\n")
-		rcBuf.WriteString("\n")
-	}
+	// do NOT unset ZDOTDIR, otherwise initialization will start to read initialization files from ~/ again
 	for _, varName := range ZshUnsetVars {
 		rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n")
 	}

Original file line number	Diff line number	Diff line change
`@@ -257,10 +257,7 @@ func (z zshShellApi) MakeRcFileStr(pk *packet.RunPacketType) string {`
`257`	`257`	`}`
`258`	`258`	`rcBuf.WriteString("\n")`
`259`	`259`	`}`
`260`		`- if shellenv.FindVarDecl(varDecls, "ZDOTDIR") == nil {`
`261`		`- rcBuf.WriteString("unset ZDOTDIR\n")`
`262`		`- rcBuf.WriteString("\n")`
`263`		`- }`
	`260`	`+ // do NOT unset ZDOTDIR, otherwise initialization will start to read initialization files from ~/ again`
`264`	`261`	`for _, varName := range ZshUnsetVars {`
`265`	`262`	`rcBuf.WriteString("unset " + shellescape.Quote(varName) + "\n")`
`266`	`263`	`}`