Skip to content

Commit 10b7cac

Browse files
committed
#1456 - Avoid using hardcoded extension (address comment).
1 parent 53f3bf4 commit 10b7cac

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: cli/sketch/new.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"path/filepath"
2121
"strings"
2222

23+
"github.com/arduino/arduino-cli/arduino/globals"
2324
"github.com/arduino/arduino-cli/cli/errorcodes"
2425
"github.com/arduino/arduino-cli/cli/feedback"
2526
sk "github.com/arduino/arduino-cli/commands/sketch"
@@ -41,7 +42,7 @@ func initNewCommand() *cobra.Command {
4142
func runNewCommand(cmd *cobra.Command, args []string) {
4243
// Trim to avoid issues if user creates a sketch adding the .ino extesion to the name
4344
sketchName := args[0]
44-
trimmedSketchName := strings.TrimSuffix(sketchName, ".ino")
45+
trimmedSketchName := strings.TrimSuffix(sketchName, globals.MainFileValidExtension)
4546
sketchDir, err := filepath.Abs(trimmedSketchName)
4647
if err != nil {
4748
feedback.Errorf(tr("Error creating sketch: %v"), err)

Diff for: commands/sketch/new.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"os"
2222
"path/filepath"
2323

24+
"github.com/arduino/arduino-cli/arduino/globals"
2425
"github.com/arduino/arduino-cli/commands"
2526
"github.com/arduino/arduino-cli/configuration"
2627
rpc "github.com/arduino/arduino-cli/rpc/cc/arduino/cli/commands/v1"
@@ -40,7 +41,7 @@ func CreateSketch(sketchDir string, sketchName string) (string, error) {
4041
return "", err
4142
}
4243
baseSketchName := filepath.Base(sketchDir)
43-
sketchFile := filepath.Join(sketchDir, baseSketchName+".ino")
44+
sketchFile := filepath.Join(sketchDir, baseSketchName+globals.MainFileValidExtension)
4445
if err := ioutil.WriteFile(sketchFile, emptySketch, os.FileMode(0644)); err != nil {
4546
return "", err
4647
}

0 commit comments

Comments
 (0)