Skip to content

Commit f9bf3a8

Browse files
committedFeb 13, 2019
Remove configdir
1 parent 8659dd2 commit f9bf3a8

File tree

8 files changed

+20
-365
lines changed

8 files changed

+20
-365
lines changed
 

‎Gopkg.lock

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configs/directories.go

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,32 @@ import (
2424

2525
"github.com/arduino/go-paths-helper"
2626
"github.com/arduino/go-win32-utils"
27-
"github.com/shibukawa/configdir"
2827
)
2928

30-
// getDefaultConfigFilePath returns the default path for arduino-cli.yaml. It searches the following directories for an existing arduino-cli.yaml file:
31-
// - User level configuration folder(e.g. $HOME/.config/<vendor-name>/<application-name>/setting.json in Linux)
32-
// - System level configuration folder(e.g. /etc/xdg/<vendor-name>/<application-name>/setting.json in Linux)
33-
// If it doesn't find one, it defaults to the user level configuration folder
29+
// getDefaultConfigFilePath returns the default path for arduino-cli.yaml
3430
func getDefaultConfigFilePath() *paths.Path {
35-
configDirs := configdir.New("arduino", "arduino-cli")
31+
usr, err := user.Current()
32+
if err != nil {
33+
panic(fmt.Errorf("retrieving user home dir: %s", err))
34+
}
35+
arduinoDataDir := paths.New(usr.HomeDir)
3636

37-
// Search for a suitable configuration file
38-
path := configDirs.QueryFolderContainsFile("arduino-cli.yaml")
39-
if path != nil {
40-
return paths.New(path.Path, "arduino-cli.yaml")
37+
switch runtime.GOOS {
38+
case "linux":
39+
arduinoDataDir = arduinoDataDir.Join(".arduino15")
40+
case "darwin":
41+
arduinoDataDir = arduinoDataDir.Join("Library", "arduino15")
42+
case "windows":
43+
localAppDataPath, err := win32.GetLocalAppDataFolder()
44+
if err != nil {
45+
panic(err)
46+
}
47+
arduinoDataDir = paths.New(localAppDataPath).Join("Arduino15")
48+
default:
49+
panic(fmt.Errorf("unsupported OS: %s", runtime.GOOS))
4150
}
42-
// Default to the global configuration
43-
locals := configDirs.QueryFolders(configdir.Global)
44-
return paths.New(locals[0].Path, "arduino-cli.yaml")
4551

46-
return nil
52+
return arduinoDataDir
4753
}
4854

4955
func getDefaultArduinoDataDir() (*paths.Path, error) {

‎vendor/github.com/shibukawa/configdir/LICENSE

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎vendor/github.com/shibukawa/configdir/README.rst

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎vendor/github.com/shibukawa/configdir/config.go

Lines changed: 0 additions & 160 deletions
This file was deleted.

‎vendor/github.com/shibukawa/configdir/config_darwin.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎vendor/github.com/shibukawa/configdir/config_windows.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)