use ~/.config/dagger rather than ~/.dagger

since `.dagger` directories have a special meaning now because of gitflow,
it's better not to have a `~/.dagger` since it's not a workspace and
it confuses dagger (e.g. `dagger new` from $HOME).

We don't store state there anymore, just keys and the last version
check, so it's okay to be in ~/.config IMO

Looking at my system, in ~/.config there's `gcloud`, `gatsby`, `gh`,
`yarn`, and others so it seems like a pretty common location.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi
2021-05-29 02:33:40 -07:00
parent 7ec90a6155
commit c5c586ff71
4 changed files with 31 additions and 9 deletions

View File

@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"os"
"path"
"path/filepath"
"time"
@@ -15,12 +14,35 @@ import (
)
func Path() (string, error) {
h, err := homedir.Dir()
keysFile, err := homedir.Expand("~/.config/dagger/keys.txt")
if err != nil {
return "", err
}
return path.Join(h, ".dagger", "keys.txt"), nil
// if the keys file doesn't exist, attempt a migration
if _, err := os.Stat(keysFile); errors.Is(err, os.ErrNotExist) {
migrateKeys(keysFile)
}
return keysFile, nil
}
// migrateKeys attempts a migration from `~/.dagger/keys.txt` to `~/.config/dagger/keys.txt`
func migrateKeys(keysFile string) error {
oldKeysFile, err := homedir.Expand("~/.dagger/keys.txt")
if err != nil {
return err
}
if _, err := os.Stat(oldKeysFile); err != nil {
return err
}
if err := os.MkdirAll(filepath.Dir(keysFile), 0700); err != nil {
return err
}
return os.Rename(oldKeysFile, keysFile)
}
func Default(ctx context.Context) (string, error) {
@@ -49,7 +71,7 @@ func Generate(ctx context.Context) (string, error) {
return "", fmt.Errorf("internal error: %v", err)
}
if err := os.MkdirAll(filepath.Dir(keysFile), 0755); err != nil {
if err := os.MkdirAll(filepath.Dir(keysFile), 0700); err != nil {
return "", err
}
f, err := os.OpenFile(keysFile, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)