kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

list: use homedir rather than os/user

Browse Source 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
This commit is contained in:
Andrea Luzzardi 2021-07-07 12:52:47 +02:00
parent 6e215b194e
commit 41620e6383
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/dagger/cmd/list.go
View File

@ -3,11 +3,11 @@ package cmd
import ( import (
"fmt" "fmt"
"os" "os"
"os/user"
"path" "path"
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
"go.dagger.io/dagger/cmd/dagger/cmd/common" "go.dagger.io/dagger/cmd/dagger/cmd/common"
@ -48,14 +48,12 @@ var listCmd = &cobra.Command{
} }
func formatPath(p string) string { func formatPath(p string) string {
usr, err := user.Current() dir, err := homedir.Dir()
if err != nil { if err != nil {
// Ignore error // Ignore error
return p return p
} }
dir := usr.HomeDir
if strings.HasPrefix(p, dir) { if strings.HasPrefix(p, dir) {
return path.Join("~", p[len(dir):]) return path.Join("~", p[len(dir):])
} }