Fixed config from env vars

Author: cmaglie

configs/env_vars_serializer.go

@@ -31,8 +31,6 @@ package configs
 
 import (
 	"os"
-
-	"github.com/bcmi-labs/arduino-cli/pathutils"
 )
 
 // LoadFromEnv read configurations from the environment variables
@@ -41,10 +39,9 @@ func LoadFromEnv() {
 		ProxyType = p
 	}
 	if dir, has := os.LookupEnv("ARDUINO_SKETCHBOOK_DIR"); has {
-		SketchbookFolder = pathutils.NewConstPath("Sketchbook", dir, true)
-		ArduinoHomeFolder = SketchbookFolder
+		SketchbookFolder.SetPath(dir)
 	}
 	if dir, has := os.LookupEnv("ARDUINO_DATA_DIR"); has {
-		ArduinoDataFolder = pathutils.NewConstPath("Arduino Data", dir, true)
+		ArduinoDataFolder.SetPath(dir)
 	}
 }

configs/preferences_txt_serializer.go

@@ -36,8 +36,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/bcmi-labs/arduino-cli/pathutils"
-
 	"github.com/arduino/go-properties-map"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/viper"
@@ -99,8 +97,7 @@ func LoadFromDesktopIDEPreferences() error {
 		return err
 	}
 	if dir, has := props["sketchbook.path"]; has {
-		SketchbookFolder = pathutils.NewConstPath("Sketchbook", dir, true)
-		ArduinoHomeFolder = SketchbookFolder
+		SketchbookFolder.SetPath(dir)
 	}
 	if URLs, has := props["boardsmanager.additional.urls"]; has {
 		for _, URL := range strings.Split(URLs, ",") {

configs/yaml_serializer.go

@@ -33,7 +33,6 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/bcmi-labs/arduino-cli/pathutils"
 	"github.com/sirupsen/logrus"
 	yaml "gopkg.in/yaml.v2"
 )
@@ -70,10 +69,10 @@ func LoadFromYAML(path string) error {
 	}
 
 	if ret.ArduinoDataFolder != "" {
-		ArduinoDataFolder = pathutils.NewConstPath("Arduino Data", ret.ArduinoDataFolder, true)
+		ArduinoDataFolder.SetPath(ret.ArduinoDataFolder)
 	}
 	if ret.SketchbookPath != "" {
-		SketchbookFolder = pathutils.NewConstPath("Sketchbook", ret.SketchbookPath, true)
+		SketchbookFolder.SetPath(ret.SketchbookPath)
 	}
 	if ret.ProxyType != "" {
 		ProxyType = ret.ProxyType

pathutils/pathutils.go

@@ -39,18 +39,9 @@ import (
 type Path interface {
 	// Get tries to determine the path or return an error if fails
 	Get() (string, error)
-}
 
-// NewConstPath creates a constant Path that always returns the specified
-// path, errors will always be nil
-func NewConstPath(label string, path string, createIfMissing bool) Path {
-	return &basicPath{
-		Label: label,
-		ProviderFunction: func() (string, error) {
-			return path, nil
-		},
-		CreateIfMissing: createIfMissing,
-	}
+	// SetPath change the path to the specified constant
+	SetPath(string)
 }
 
 // NewPath return a Path object that use the providerFunction to determine
@@ -106,6 +97,13 @@ func (p *basicPath) Get() (string, error) {
 	return p.cachedPath, nil
 }
 
+func (p *basicPath) SetPath(path string) {
+	p.cachedPath = ""
+	p.ProviderFunction = func() (string, error) {
+		return path, nil
+	}
+}
+
 type basicSubPath struct {
 	Label           string
 	Path            Path
@@ -137,3 +135,7 @@ func (p *basicSubPath) Get() (string, error) {
 	p.cachedPath = path
 	return p.cachedPath, nil
 }
+
+func (p *basicSubPath) SetPath(path string) {
+	panic("Could not SetPath in subPath object")
+}