8000 Change directories.template to sketch.template · arduino/arduino-cli@4c89403 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4c89403

Browse files
gsingh93gsingh93
committed
Change directories.template to sketch.template
1 parent 6840c9a commit 4c89403

File tree

3 files changed

+6
-9
lines changed
  • commands/sketch
  • configuration
  • internal/cli/config

    • 3 files changed

    +6
    -9
    lines changed

    ‎commands/sketch/new.go

    Lines changed: 3 additions & 7 deletions
    Original file line numberDiff line numberDiff line change
    @@ -55,29 +55,25 @@ func NewSketch(ctx context.Context, req *rpc.NewSketchRequest) (*rpc.NewSketchRe
    5555
    return nil, err
    5656
    }
    5757

    58-
    templateDir := configuration.Settings.GetString("directories.template")
    58+
    templateDir := configuration.Settings.GetString("sketch.template")
    5959
    sketchDirPath := paths.New(sketchesDir).Join(req.SketchName)
    60+
    sketchName := sketchDirPath.Base()
    61+
    sketchMainFilePath := sketchDirPath.Join(sketchName + globals.MainFileValidExtension)
    6062

    61-
    var sketchMainFilePath *paths.Path
    6263
    if templateDir != "" {
    6364
    templateDirPath := paths.New(templateDir)
    6465
    if err := templateDirPath.CopyDirTo(sketchDirPath); err != nil {
    6566
    return nil, &arduino.CantCreateSketchError{Cause: err}
    6667
    }
    67-
    // TODO: Make this customizable?
    68-
    sketchMainFilePath = sketchDirPath.Join("main.ino")
    6968
    } else {
    7069
    if err := sketchDirPath.MkdirAll(); err != nil {
    7170
    return nil, &arduino.CantCreateSketchError{Cause: err}
    7271
    }
    73-
    sketchName := sketchDirPath.Base()
    74-
    sketchMainFilePath = sketchDirPath.Join(sketchName + globals.MainFileValidExtension)
    7572
    if !req.Overwrite {
    7673
    if sketchMainFilePath.Exist() {
    7774
    return nil, &arduino.CantCreateSketchError{Cause: errors.New(tr(".ino file already exists"))}
    7875
    }
    7976
    }
    80-
    8177
    if err := sketchMainFilePath.WriteFile(emptySketch); err != nil {
    8278
    return nil, &arduino.CantCreateSketchError{Cause: err}
    8379
    }

    ‎configuration/defaults.go

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -38,7 +38,6 @@ func SetDefaults(settings *viper.Viper) {
    3838
    // arduino directories
    3939
    settings.SetDefault("directories.Data", getDefaultArduinoDataDir())
    4040
    settings.SetDefault("directories.Downloads", filepath.Join(getDefaultArduinoDataDir(), "staging"))
    41-
    settings.SetDefault("directories.Template", "")
    4241
    settings.SetDefault("directories.User", getDefaultUserDir())
    4342

    4443
    // Sketch compilation
    @@ -70,4 +69,6 @@ func SetDefaults(settings *viper.Viper) {
    7069
    settings.BindEnv("directories.Downloads", "ARDUINO_DOWNLOADS_DIR")
    7170
    settings.BindEnv("directories.Data", "ARDUINO_DATA_DIR")
    7271
    settings.BindEnv("sketch.always_export_binaries", "ARDUINO_SKETCH_ALWAYS_EXPORT_BINARIES")
    72+
    73+
    settings.SetDefault("sketch.template", "")
    7374
    }

    ‎internal/cli/config/validate.go

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -27,7 +27,6 @@ var validMap = map[string]reflect.Kind{
    2727
    "daemon.port": reflect.String,
    2828
    "directories.data": reflect.String,
    2929
    "directories.downloads": reflect.String,
    30-
    "directories.template": reflect.String,
    3130
    "directories.user": reflect.String,
    3231
    "directories.builtin.tools": reflect.String,
    3332
    "directories.builtin.libraries": reflect.String,
    @@ -37,6 +36,7 @@ var validMap = map[string]reflect.Kind{
    3736
    "logging.format": reflect.String,
    3837
    "logging.level": reflect.String,
    3938
    "sketch.always_export_binaries": reflect.Bool,
    39+
    "sketch.template": reflect.String,
    4040
    "metrics.addr": reflect.String,
    4141
    "metrics.enabled": reflect.Bool,
    4242
    "network.proxy": reflect.String,

    0 commit comments

    Comments
     (0)
    0