Skip to content

Use Realpath instead of EvalSymlinks for exe dir #2381

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
jakebailey merged 1 commit into from
Dec 17, 2025
Merged

Use Realpath instead of EvalSymlinks for exe dir #2381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 7 additions & 9 deletions internal/bundled/noembed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ package bundled
import (
"fmt"
"os"
"path/filepath"
"sync"
"testing"

"github.com/microsoft/typescript-go/internal/tspath"
"github.com/microsoft/typescript-go/internal/vfs"
"github.com/microsoft/typescript-go/internal/vfs/osvfs"
)

const embedded = false
Expand All @@ -24,11 +24,9 @@ var executableDir = sync.OnceValue(func() string {
if err != nil {
panic(fmt.Sprintf("bundled: failed to get executable path: %v", err))
}
exe, err = filepath.EvalSymlinks(exe)
if err != nil {
panic(fmt.Sprintf("bundled: failed to evaluate symlinks: %v", err))
}
return filepath.Dir(exe)
exe = tspath.NormalizeSlashes(exe)
exe = osvfs.FS().Realpath(exe)
return tspath.GetDirectoryPath(exe)
})

var libPath = sync.OnceValue(func() string {
Expand All @@ -37,10 +35,10 @@ var libPath = sync.OnceValue(func() string {
}
dir := executableDir()

libdts := filepath.Join(dir, "lib.d.ts")
if _, err := os.Stat(libdts); err != nil {
libdts := tspath.CombinePaths(dir, "lib.d.ts")
if info := osvfs.FS().Stat(libdts); info == nil {
panic(fmt.Sprintf("bundled: %v does not exist; this executable may be misplaced", libdts))
}

return tspath.NormalizeSlashes(dir)
return dir
})