Skip to content

Commit c530613

Browse files
authored
Merge pull request #21 from tonedefdev/hotfix
2 parents 96af447 + f9f34ae commit c530613

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

cmd/generate.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cmd
22

33
import (
4+
"github.com/tonedefdev/terracreds/pkg/helpers"
45
"github.com/urfave/cli/v2"
56
)
67

@@ -22,8 +23,11 @@ func (cmd *Config) NewCommandGenerate() *cli.Command {
2223
},
2324
},
2425
Action: func(c *cli.Context) error {
25-
GenerateTerraCreds(c, cmd.Version, cmd.Confirm)
26-
return nil
26+
err := GenerateTerraCreds(c, cmd.Version, cmd.Confirm)
27+
if err != nil {
28+
helpers.CheckError(err)
29+
}
30+
return err
2731
},
2832
}
2933

cmd/terracreds.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,17 @@ type TerraCreds interface {
3232

3333
// CopyTerraCreds will create a copy of the binary to the destination path.
3434
func CopyTerraCreds(dest string) error {
35-
from, err := os.Open(string(os.Args[0]))
35+
exec, err := os.Executable()
36+
if err != nil {
37+
return err
38+
}
39+
40+
resolvedExecPath, err := filepath.EvalSymlinks(exec)
41+
if err != nil {
42+
return err
43+
}
44+
45+
from, err := os.Open(resolvedExecPath)
3646
if err != nil {
3747
return err
3848
}
@@ -49,7 +59,7 @@ func CopyTerraCreds(dest string) error {
4959
return err
5060
}
5161

52-
fmt.Fprintf(color.Output, "%s: Copied binary '%s' to '%s'\n", color.CyanString("INFO"), string(os.Args[0]), dest)
62+
fmt.Fprintf(color.Output, "%s: Copied binary '%s' to '%s'\n", color.CyanString("INFO"), resolvedExecPath, dest)
5363
return err
5464
}
5565

0 commit comments

Comments
 (0)