From 1f36f0e7df5b33c4922e98a354d401b559b5ceb4 Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrew@andrewrynhard.com>
Date: Thu, 20 Jun 2019 17:57:57 -0700
Subject: [PATCH] refactor(osctl): use UserHomeDir to detect user home
 directory (#749)

Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
---
 Dockerfile            | 2 +-
 cmd/osctl/cmd/root.go | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0f36dab25..9269fed34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -63,7 +63,7 @@ ARG SHA
 ARG TAG
 ARG VERSION_PKG="github.com/talos-systems/talos/internal/pkg/version"
 WORKDIR /src/cmd/osctl
-RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=1 go build -a -ldflags "-s -w -linkmode external -extldflags \"-static\" -X ${VERSION_PKG}.Name=Client -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /osctl-linux-amd64
+RUN GOOS=linux GOARCH=amd64 go build -a -ldflags "-s -w -linkmode external -extldflags \"-static\" -X ${VERSION_PKG}.Name=Client -X ${VERSION_PKG}.SHA=${SHA} -X ${VERSION_PKG}.Tag=${TAG}" -o /osctl-linux-amd64
 RUN chmod +x /osctl-linux-amd64
 
 FROM scratch AS osctl-linux-amd64
diff --git a/cmd/osctl/cmd/root.go b/cmd/osctl/cmd/root.go
index ddfd743bb..7b99201f8 100644
--- a/cmd/osctl/cmd/root.go
+++ b/cmd/osctl/cmd/root.go
@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"os"
 	"os/signal"
-	"os/user"
 	"path"
 	"syscall"
 
@@ -83,11 +82,11 @@ func Execute() {
 		ok                 bool
 	)
 	if defaultTalosConfig, ok = os.LookupEnv(constants.TalosConfigEnvVar); !ok {
-		u, err := user.Current()
+		home, err := os.UserHomeDir()
 		if err != nil {
 			return
 		}
-		defaultTalosConfig = path.Join(u.HomeDir, ".talos", "config")
+		defaultTalosConfig = path.Join(home, ".talos", "config")
 	}
 	rootCmd.PersistentFlags().StringVar(&talosconfig, "talosconfig", defaultTalosConfig, "The path to the Talos configuration file")
 	if err := rootCmd.Execute(); err != nil {