Fix the suffix bug in Windows #16
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -11,6 +11,7 @@ import ( | |||||||||||||||||||
| "os/exec" | ||||||||||||||||||||
| "path/filepath" | ||||||||||||||||||||
| "regexp" | ||||||||||||||||||||
| "runtime" | ||||||||||||||||||||
| "text/tabwriter" | ||||||||||||||||||||
| "time" | ||||||||||||||||||||
|
|
||||||||||||||||||||
|
|
@@ -24,13 +25,17 @@ const exercisesDir = "exercises" | |||||||||||||||||||
| // maxRuntime is the maximum time an exercise is allowed to run in watch mode. | ||||||||||||||||||||
| const maxRuntime = 5 * time.Second | ||||||||||||||||||||
|
|
||||||||||||||||||||
| var ( | ||||||||||||||||||||
| reStillGoing = regexp.MustCompile(`(?m)^\s*//\s+I\s+AM\s+STILL\s+GOING`) | ||||||||||||||||||||
| reExercise = regexp.MustCompile(`^(?P<id>\d+)-(?P<name>.+)$`) | ||||||||||||||||||||
| ) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| var ( | ||||||||||||||||||||
| plain = color.New() | ||||||||||||||||||||
| red = color.New(color.FgRed) | ||||||||||||||||||||
| yellow = color.New(color.FgYellow) | ||||||||||||||||||||
| green = color.New(color.FgGreen) | ||||||||||||||||||||
| ) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| var rootCmd = &cobra.Command{ | ||||||||||||||||||||
| Use: "gopherlings", | ||||||||||||||||||||
|
|
@@ -47,8 +52,10 @@ func init() { | |||||||||||||||||||
| func main() { | ||||||||||||||||||||
| err := rootCmd.Execute() | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| _, err = red.Fprintln(os.Stderr, err) | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
|
|
@@ -62,13 +69,25 @@ func errExit(err error) { | |||||||||||||||||||
|
|
||||||||||||||||||||
| if errors.Is(err, ErrAllDone) { | ||||||||||||||||||||
| // Error: success ;) | ||||||||||||||||||||
| _, err = plain.Printf(goBuildSomething) | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| os.Exit(0) | ||||||||||||||||||||
| } else if errors.Is(err, ErrNoExercisesDir) { | ||||||||||||||||||||
| _, err = red.Fprintln(os.Stderr, `No "exercises" directory.`) | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| _, err = red.Fprintln(os.Stderr, "Please run this from the root of a Gopherlings repo checkout.") | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } else { | ||||||||||||||||||||
| _, err = red.Fprintln(os.Stderr, err) | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
|
|
@@ -344,45 +363,53 @@ func runPkg(ctx context.Context, pkgPath string) error { | |||||||||||||||||||
| // subprocess if the context is canceled. | ||||||||||||||||||||
|
|
||||||||||||||||||||
| plain.Println("Compiling", pkgPath) | ||||||||||||||||||||
| tmpPath, err := compilePkg(ctx, pkgPath) | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| return err | ||||||||||||||||||||
| } | ||||||||||||||||||||
| defer os.Remove(tmpPath) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| plain.Println("Executing", pkgPath) | ||||||||||||||||||||
| plain.Println() | ||||||||||||||||||||
| return execFile(ctx, tmpPath) | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| func compilePkg(ctx context.Context, pkg string) (string, error) { | ||||||||||||||||||||
| name := filepath.Base(pkg) | ||||||||||||||||||||
| if runtime.GOOS == "windows" { | ||||||||||||||||||||
| name += ".exe" | ||||||||||||||||||||
| } | ||||||||||||||||||||
| f, err := os.CreateTemp("", name) | ||||||||||||||||||||
|
Comment on lines
+379
to
382
There was a problem hiding this comment. On Windows, appending
Suggested change
|
||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| return "", err | ||||||||||||||||||||
| } | ||||||||||||||||||||
| tmpPath := f.Name() | ||||||||||||||||||||
| f.Close() | ||||||||||||||||||||
|
There was a problem hiding this comment. The result of
Suggested change
|
||||||||||||||||||||
|
|
||||||||||||||||||||
| cmd := exec.CommandContext(ctx, "go", "build", "-o", tmpPath, pkg) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| stderr := new(bytes.Buffer) | ||||||||||||||||||||
| cmd.Stderr = stderr | ||||||||||||||||||||
|
|
||||||||||||||||||||
| err = cmd.Run() | ||||||||||||||||||||
| if err != nil { | ||||||||||||||||||||
| os.Remove(tmpPath) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| plain.Println("Compilation failed.") | ||||||||||||||||||||
| plain.Println() | ||||||||||||||||||||
|
|
||||||||||||||||||||
| _, printErr := red.Println(stderr) | ||||||||||||||||||||
| if printErr != nil { | ||||||||||||||||||||
| os.Exit(1) | ||||||||||||||||||||
| } | ||||||||||||||||||||
| return "", err | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| return tmpPath, nil | ||||||||||||||||||||
| } | ||||||||||||||||||||
|
|
||||||||||||||||||||
| func execFile(ctx context.Context, tmpPath string) error { | ||||||||||||||||||||
| cmd := exec.CommandContext(ctx, tmpPath) | ||||||||||||||||||||
|
|
||||||||||||||||||||
| // TODO: Use io.LimitReader to prevent excessive output. | ||||||||||||||||||||
| cmd.Stdout = os.Stdout | ||||||||||||||||||||
|
|
||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| module github.com/soypat/gopherlings | ||
|
|
||
| go 1.26 | ||
|
|
||
| require ( | ||
| github.com/fatih/color v1.19.0 | ||
| github.com/fsnotify/fsnotify v1.9.0 | ||
| github.com/spf13/cobra v1.10.2 | ||
|
Comment on lines
+3
to
+8
There was a problem hiding this comment. The PR description is about a Windows suffix bug, but this change also bumps the module |
||
| ) | ||
|
|
||
| require ( | ||
| github.com/inconshreveable/mousetrap v1.1.0 // indirect | ||
| github.com/mattn/go-colorable v0.1.14 // indirect | ||
| github.com/mattn/go-isatty v0.0.20 // indirect | ||
| github.com/spf13/pflag v1.0.10 // indirect | ||
| golang.org/x/sys v0.42.0 // indirect | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,22 @@ | ||
| github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= | ||
| github.com/fatih/color v1.19.0 h1:Zp3PiM21/9Ld6FzSKyL5c/BULoe/ONr9KlbYVOfG8+w= | ||
| github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE= | ||
| github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= | ||
| github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= | ||
| github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= | ||
| github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= | ||
| github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= | ||
| github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= | ||
| github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= | ||
| github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= | ||
| github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= | ||
| github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= | ||
| github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= | ||
| github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | ||
| github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= | ||
| github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= | ||
| go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= | ||
| golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | ||
| golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo= | ||
| golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= | ||
| gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mainno longer exits with a non-zero status whenrootCmd.Execute()returns an error. After printing the error, the program falls through and returns exit code 0 unless printing fails, which will mask failures for callers/CI. Ensure the error path still callsos.Exit(1)(or returns an error tomain).