@@ -20,12 +20,11 @@ package configs
20
20
import (
21
21
"fmt"
22
22
"os"
23
- "os/user"
24
23
"runtime"
25
24
26
- "github.com/arduino/go-paths-helper"
27
-
28
- "github.com/arduino /go-win32-utils "
25
+ paths "github.com/arduino/go-paths-helper"
26
+ win32 "github.com/arduino/go-win32-utils"
27
+ homedir "github.com/mitchellh /go-homedir "
29
28
)
30
29
31
30
// getDefaultConfigFilePath returns the default path for .cli-config.yml,
@@ -39,11 +38,11 @@ func getDefaultConfigFilePath() *paths.Path {
39
38
}
40
39
41
40
func getDefaultArduinoDataDir () (* paths.Path , error ) {
42
- usr , err := user . Current ()
41
+ homedir , err := homedir . Dir ()
43
42
if err != nil {
44
43
return nil , fmt .Errorf ("retrieving user home dir: %s" , err )
45
44
}
46
- arduinoDataDir := paths .New (usr . HomeDir )
45
+ arduinoDataDir := paths .New (homedir )
47
46
48
47
switch runtime .GOOS {
49
48
case "linux" :
@@ -63,16 +62,16 @@ func getDefaultArduinoDataDir() (*paths.Path, error) {
63
62
}
64
63
65
64
func getDefaultSketchbookDir () (* paths.Path , error ) {
66
- usr , err := user . Current ()
65
+ homedir , err := homedir . Dir ()
67
66
if err != nil {
68
67
return nil , fmt .Errorf ("retrieving home dir: %s" , err )
69
68
}
70
69
71
70
switch runtime .GOOS {
72
71
case "linux" :
73
- return paths .New (usr . HomeDir ).Join ("Arduino" ), nil
72
+ return paths .New (homedir ).Join ("Arduino" ), nil
74
73
case "darwin" :
75
- return paths .New (usr . HomeDir ).Join ("Documents" , "Arduino" ), nil
74
+ return paths .New (homedir ).Join ("Documents" , "Arduino" ), nil
76
75
case "windows" :
77
76
documentsPath , err := win32 .GetDocumentsFolder ()
78
77
if err != nil {
0 commit comments