Merge pull request #45 from GreyXor/master

Misc package improvements

go.mod

@@ -1,8 +1,14 @@
 module github.com/adrg/xdg
 
-go 1.14
+go 1.19
 
 require (
 	github.com/stretchr/testify v1.8.1
-	golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359
+	golang.org/x/sys v0.4.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -10,8 +10,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 h1:2B5p2L5IfGiD7+b9BOoRMC6DgObAVZV+Fsp050NqXik=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/pathutil/pathutil.go

@@ -40,15 +40,16 @@ func Unique(paths []string, home string) []string {
 // it can also contain a set of parent directories, which will be created
 // relative to the selected parent path.
 func Create(name string, paths []string) (string, error) {
-	var searchedPaths []string
+	searchedPaths := make([]string, 0, len(paths))
+
 	for _, p := range paths {
 		p = filepath.Join(p, name)
 
 		dir := filepath.Dir(p)
 		if Exists(dir) {
 			return p, nil
 		}
-		if err := os.MkdirAll(dir, os.ModeDir|0700); err == nil {
+		if err := os.MkdirAll(dir, os.ModeDir|0o700); err == nil {
 			return p, nil
 		}
 
@@ -63,7 +64,8 @@ func Create(name string, paths []string) (string, error) {
 // slice of `paths`. The `name` parameter must contain the name of the file,
 // but it can also contain a set of parent directories.
 func Search(name string, paths []string) (string, error) {
-	var searchedPaths []string
+	searchedPaths := make([]string, 0, len(paths))
+
 	for _, p := range paths {
 		p = filepath.Join(p, name)
 		if Exists(p) {

internal/pathutil/pathutil_test.go

@@ -5,8 +5,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/adrg/xdg/internal/pathutil"
 	"github.com/stretchr/testify/require"
+
+	"github.com/adrg/xdg/internal/pathutil"
 )
 
 func TestExists(t *testing.T) {

internal/pathutil/pathutil_unix_test.go

@@ -7,8 +7,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/adrg/xdg/internal/pathutil"
 	"github.com/stretchr/testify/require"
+
+	"github.com/adrg/xdg/internal/pathutil"
 )
 
 func TestExpandHome(t *testing.T) {

paths_unix_test.go

@@ -9,8 +9,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/adrg/xdg"
 	"github.com/stretchr/testify/require"
+
+	"github.com/adrg/xdg"
 )
 
 func TestDefaultBaseDirs(t *testing.T) {

xdg.go

@@ -29,7 +29,7 @@ var (
 
 	// ConfigHome defines the base directory relative to which user-specific
 	// configuration files should be written. This directory is defined by
-	// the $XDG_CONFIG_HOME environment variable. If the variable is not
+	// the $XDG_CONFIG_HOME environment variable. If the variable is
 	// not set, a default equal to $HOME/.config should be used.
 	ConfigHome string
 

xdg_test.go

@@ -5,8 +5,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/adrg/xdg"
 	"github.com/stretchr/testify/require"
+
+	"github.com/adrg/xdg"
 )
 
 type envSample struct {