mirror of
https://github.com/CHN-beta/nixpkgs.git
synced 2026-01-11 10:22:54 +08:00
1fcc12742d
This facilitates using different Go and wasm-bindgen-cli versions more
easily, which will be needed for the new teleport_18 version.
(cherry picked from commit 2dee29888f)
18 lines
499 B
Diff
18 lines
499 B
Diff
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
|
|
index 5de21c69d0..3995c19e3c 100644
|
|
--- a/tool/tsh/common/tsh.go
|
|
+++ b/tool/tsh/common/tsh.go
|
|
@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
|
|
}
|
|
|
|
var err error
|
|
- cf.executablePath, err = os.Executable()
|
|
+ tempBinaryPath, err := os.Executable()
|
|
if err != nil {
|
|
return trace.Wrap(err)
|
|
}
|
|
+ cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
|
|
|
|
// configs
|
|
setEnvFlags(&cf)
|