From 0c6b3c320f5389a7eccfd869e6c98f5093ecac40 Mon Sep 17 00:00:00 2001 From: "Antoine C." Date: Sat, 18 Jan 2025 16:19:05 +0000 Subject: [PATCH] fix(Zed): remove the double leading slashes on project --- pkg/ide/zed/zed.go | 6 +++++- pkg/ide/zed/zed_linux.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/ide/zed/zed.go b/pkg/ide/zed/zed.go index b233a05ad..6ae8693c0 100644 --- a/pkg/ide/zed/zed.go +++ b/pkg/ide/zed/zed.go @@ -16,7 +16,11 @@ import ( func Open(ctx context.Context, values map[string]config.OptionValue, userName, workspaceFolder, workspaceID string, log log.Logger) error { log.Info("Opening Zed editor...") - sshHost := fmt.Sprintf("%s.devpod/%s", workspaceID, workspaceFolder) + if len(workspaceFolder) == 0 || workspaceFolder[0] != '/' { + workspaceFolder = fmt.Sprintf("/%s", workspaceFolder) + } + + sshHost := fmt.Sprintf("%s.devpod%s", workspaceID, workspaceFolder) openURL := fmt.Sprintf("zed://ssh/%s", sshHost) err := open.Run(openURL) if err != nil { diff --git a/pkg/ide/zed/zed_linux.go b/pkg/ide/zed/zed_linux.go index 8011888dc..a06bca067 100644 --- a/pkg/ide/zed/zed_linux.go +++ b/pkg/ide/zed/zed_linux.go @@ -16,7 +16,11 @@ import ( func Open(ctx context.Context, values map[string]config.OptionValue, userName, workspaceFolder, workspaceID string, log log.Logger) error { log.Info("Opening Zed editor...") - sshHost := fmt.Sprintf("%s.devpod/%s", workspaceID, workspaceFolder) + if len(workspaceFolder) == 0 || workspaceFolder[0] != '/' { + workspaceFolder = fmt.Sprintf("/%s", workspaceFolder) + } + + sshHost := fmt.Sprintf("%s.devpod%s", workspaceID, workspaceFolder) openURL := fmt.Sprintf("zed://ssh/%s", sshHost) out, err := exec.Command("xdg-open", openURL).CombinedOutput() if err != nil {