Commitef089be

committed

safe assign

1 parent9c1bf01 commitef089beCopy full SHA for ef089be

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,16 @@ func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script co`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`funcexpandDevcontainerPaths(logger slog.Logger,expandPathfunc(string) (string,error),dc codersdk.WorkspaceAgentDevcontainer) codersdk.WorkspaceAgentDevcontainer {`
`67`		`-varerrerror`
`68`		`-ifdc.WorkspaceFolder,err=expandPath(dc.WorkspaceFolder);err!=nil {`
	`67`	`+ifwf,err:=expandPath(dc.WorkspaceFolder);err!=nil {`
`69`	`68`	`logger.Warn(context.Background(),"expand devcontainer workspace folder failed",slog.Error(err))`
	`69`	`+}else {`
	`70`	`+dc.WorkspaceFolder=wf`
`70`	`71`	`}`
`71`	`72`	`ifdc.ConfigPath!="" {`
`72`		`-ifdc.ConfigPath,err=expandPath(dc.ConfigPath);err!=nil {`
	`73`	`+ifcp,err:=expandPath(dc.ConfigPath);err!=nil {`
`73`	`74`	`logger.Warn(context.Background(),"expand devcontainer config path failed",slog.Error(err))`
	`75`	`+}else {`
	`76`	`+dc.ConfigPath=cp`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`	`returndc`

Comments

(0)