mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-08-26 09:01:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor(osctl): use UserHomeDir to detect user home directory (#749)

Browse Source 
Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
This commit is contained in:
Andrew Rynhard 2019-06-20 17:57:57 -07:00 committed by GitHub
parent 9ed45f7090
commit 1f36f0e7df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -63,7 +63,7 @@ ARG SHA
ARG TAG ARG TAG
ARG VERSION_PKG="github.com/talos-systems/talos/internal/pkg/version" ARG VERSION_PKG="github.com/talos-systems/talos/internal/pkg/version"
WORKDIR /src/cmd/osctl 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 RUN chmod +x /osctl-linux-amd64
FROM scratch AS osctl-linux-amd64 FROM scratch AS osctl-linux-amd64

5
cmd/osctl/cmd/root.go
View File

@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"os" "os"
"os/signal" "os/signal"
"os/user"
"path" "path"
"syscall" "syscall"
@ -83,11 +82,11 @@ func Execute() {
ok bool ok bool
) )
if defaultTalosConfig, ok = os.LookupEnv(constants.TalosConfigEnvVar); !ok { if defaultTalosConfig, ok = os.LookupEnv(constants.TalosConfigEnvVar); !ok {
u, err := user.Current() home, err := os.UserHomeDir()
if err != nil { if err != nil {
return 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") rootCmd.PersistentFlags().StringVar(&talosconfig, "talosconfig", defaultTalosConfig, "The path to the Talos configuration file")
if err := rootCmd.Execute(); err != nil { if err := rootCmd.Execute(); err != nil {