From e413252d3b29c7cdb0f86f14725c14ddce6ff363 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 13 Jul 2019 13:08:01 +0200 Subject: [PATCH] mod: newer xdg package need to use newer commit, because of BSD support --- go.mod | 3 +- go.sum | 7 ++--- vendor/github.com/OpenPeeDeeP/xdg/README.md | 4 +-- vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go | 32 ++++++++++++++++++++ vendor/modules.txt | 2 +- 5 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go diff --git a/go.mod b/go.mod index 6cd363ca..214aafdb 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.12 require ( github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Microsoft/go-winio v0.4.12 // indirect - github.com/OpenPeeDeeP/xdg v0.2.0 + github.com/OpenPeeDeeP/xdg v0.2.1-0.20190312153938-4ba9e1eb294c github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/docker/distribution v2.7.1+incompatible // indirect @@ -34,7 +34,6 @@ require ( github.com/onsi/gomega v1.5.0 // indirect github.com/opencontainers/go-digest v1.0.0-rc1 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect - github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 // indirect github.com/sirupsen/logrus v1.3.0 github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad github.com/stretchr/testify v1.2.2 diff --git a/go.sum b/go.sum index 06b9b36d..c4e0aca1 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.4.12 h1:xAfWHN1IrQ0NJ9TBC0KBZoqLjzDTr1ML+4MywiUOryc= github.com/Microsoft/go-winio v0.4.12/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/OpenPeeDeeP/xdg v0.2.0 h1:xr89rnllbkRkM7SV9Y++FJ8TGkbdkhhBQm5kOkGT7AE= -github.com/OpenPeeDeeP/xdg v0.2.0/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo= +github.com/OpenPeeDeeP/xdg v0.2.1-0.20190312153938-4ba9e1eb294c h1:YDsGA6tou+tAxVe0Dre29iSbQ8TrWdWfwOisKArJT5E= +github.com/OpenPeeDeeP/xdg v0.2.1-0.20190312153938-4ba9e1eb294c/go.mod h1:tMoSueLQlMf0TCldjrJLNIjAc5qAOIcHt5REi88/Ygo= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8= github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -85,12 +85,11 @@ github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 h1:Xuk8ma/ibJ1fOy4Ee11vHhUFHQNpHhrBneOCNHVXS5w= -github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0/go.mod h1:7AwjWCpdPhkSmNAgUv5C7EJ4AbmjEB3r047r3DXWu3Y= github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad h1:fiWzISvDn0Csy5H0iwgAuJGQTUpVfEMJJd4nRFXogbc= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/vendor/github.com/OpenPeeDeeP/xdg/README.md b/vendor/github.com/OpenPeeDeeP/xdg/README.md index 09896181..7157d9bf 100644 --- a/vendor/github.com/OpenPeeDeeP/xdg/README.md +++ b/vendor/github.com/OpenPeeDeeP/xdg/README.md @@ -8,13 +8,13 @@ The following table shows what is used if the envrionment variable is not set. I > When creating `XDG` application the `Vendor` and `Application` names are appeneded to the end of the path to keep projects unique. -| | Linux | Mac | Windows | +| | Linux(and BSD) | Mac | Windows | | ---: | :---: | :---: | :---: | | `XDG_DATA_DIRS` | [`/usr/local/share`, `/usr/share`] | [`/Library/Application Support`] | `%PROGRAMDATA%` | | `XDG_DATA_HOME` | `~/.local/share` | `~/Library/Application Support` | `%APPDATA%` | | `XDG_CONFIG_DIRS` | [`/etc/xdg`] | [`/Library/Application Support`] | `%PROGRAMDATA%` | | `XDG_CONFIG_HOME` | `~/.config` | `~/Library/Application Support` | `%APPDATA%` | -| `XDG_CACHE_HOME` | `~/.cache` | `~/Library/Cache` | `%LOCALAPPDATA%` | +| `XDG_CACHE_HOME` | `~/.cache` | `~/Library/Caches` | `%LOCALAPPDATA%` | ## Notes diff --git a/vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go b/vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go new file mode 100644 index 00000000..ea99f2fd --- /dev/null +++ b/vendor/github.com/OpenPeeDeeP/xdg/xdg_bsd.go @@ -0,0 +1,32 @@ +// +build freebsd openbsd netbsd + +// Copyright (c) 2017, OpenPeeDeeP. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package xdg + +import ( + "os" + "path/filepath" +) + +func (o *osDefaulter) defaultDataHome() string { + return filepath.Join(os.Getenv("HOME"), ".local", "share") +} + +func (o *osDefaulter) defaultDataDirs() []string { + return []string{"/usr/local/share/", "/usr/share/"} +} + +func (o *osDefaulter) defaultConfigHome() string { + return filepath.Join(os.Getenv("HOME"), ".config") +} + +func (o *osDefaulter) defaultConfigDirs() []string { + return []string{"/etc/xdg"} +} + +func (o *osDefaulter) defaultCacheHome() string { + return filepath.Join(os.Getenv("HOME"), ".cache") +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c1e9297..0fb9e499 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,6 +1,6 @@ # github.com/Microsoft/go-winio v0.4.12 github.com/Microsoft/go-winio -# github.com/OpenPeeDeeP/xdg v0.2.0 +# github.com/OpenPeeDeeP/xdg v0.2.1-0.20190312153938-4ba9e1eb294c github.com/OpenPeeDeeP/xdg # github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/acarl005/stripansi