kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-10 11:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle errors from os/user

Browse Source 
We use it to generate defaults, if error is found, we imply preserve
permissions
This commit is contained in:
Ettore Di Giacinto
2020-04-11 20:05:56 +02:00
parent 0fe2a8c950
commit f987ee9fa0
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/root.go
View File

@@ -133,12 +133,14 @@ func init() {
pflags.BoolP("debug", "d", false, "verbose output") pflags.BoolP("debug", "d", false, "verbose output")
pflags.Bool("fatal", false, "Enables Warnings to exit") pflags.Bool("fatal", false, "Enables Warnings to exit")
u, err := user.Current()
if err != nil {
Fatal("failed to retrieve user identity:", err.Error())
}
sameOwner := false sameOwner := false
if u.Uid == "0" { u, err := user.Current()
// os/user doesn't work in from scratch environments
if err != nil {
Warning("failed to retrieve user identity:", err.Error())
sameOwner = true
}
if u != nil && u.Uid == "0" {
sameOwner = true sameOwner = true
} }
pflags.Bool("same-owner", sameOwner, "Maintain same owner on uncompress.") pflags.Bool("same-owner", sameOwner, "Maintain same owner on uncompress.")

5
pkg/config/config.go
View File

@@ -212,8 +212,9 @@ func GenDefault(viper *v.Viper) {
viper.SetDefault("general.spinner_charset", 22) viper.SetDefault("general.spinner_charset", 22)
viper.SetDefault("general.fatal_warnings", false) viper.SetDefault("general.fatal_warnings", false)
u, _ := user.Current() u, err := user.Current()
if u.Uid == "0" { // os/user doesn't work in from scratch environments
if err != nil || u.Uid == "0" {
viper.SetDefault("general.same_owner", true) viper.SetDefault("general.same_owner", true)
} else { } else {
viper.SetDefault("general.same_owner", false) viper.SetDefault("general.same_owner", false)