Skip to content
This repository has been archived by the owner on Mar 24, 2024. It is now read-only.

feat: use environment variables for init if they exist #281

Merged
merged 4 commits into from
Sep 19, 2023
Merged

feat: use environment variables for init if they exist #281

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a401caa
feat: use environment variables for init if they exist
bketelsen Sep 18, 2023
689e5c6
feat: use environment variables for init if they exist
bketelsen Sep 18, 2023
f6f4c40
Merge remote-tracking branch 'origin/main' into nopromptinit
bketelsen Sep 18, 2023
a6b3c0f
fix: typo
bketelsen Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 90 additions & 71 deletions internal/fleek/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,31 +123,38 @@ func NewSystem() (*System, error) {
func NewUser() (*User, error) {
fin.Info.Println("Enter User Details for Git Configuration:")
user := &User{}
name, err := Name()
if err != nil {
return user, err
}
// Prompt for name
var use bool
name = strings.TrimSpace(name)
if name != "" {

fin.Info.Println("Detected your name: " + name)
use, err = ux.Confirm("Use detected name: " + name)
envname := os.Getenv("FLEEK_USER_NAME")
if envname == "" {
name, err := Name()
if err != nil {
return user, err
}
}
if use {
user.Name = name
} else {
prompt := "Name"
iname, err := ux.Input(prompt, name, "Your Name")
if err != nil {
return user, err
// Prompt for name
name = strings.TrimSpace(name)
if name != "" {

fin.Info.Println("Detected your name: " + name)
use, err = ux.Confirm("Use detected name: " + name)
if err != nil {
return user, err
}
}
user.Name = iname
if use {
user.Name = name
} else {
prompt := "Name"
iname, err := ux.Input(prompt, name, "Your Name")
if err != nil {
return user, err
}
user.Name = iname
}
} else {
user.Name = envname
}

// It doesn't make sense to change the username,
// so just use the detected one
uname, err := Username()
Expand All @@ -156,75 +163,87 @@ func NewUser() (*User, error) {
}
user.Username = uname

// email
envmail := os.Getenv("FLEEK_USER_EMAIL")
if envmail == "" {
// email

cmd := "git"
cmdLine := []string{"config", "--global", "user.email"}
command := exec.Command(cmd, cmdLine...)
command.Stdin = os.Stdin
cmd := "git"
cmdLine := []string{"config", "--global", "user.email"}
command := exec.Command(cmd, cmdLine...)
command.Stdin = os.Stdin

command.Env = os.Environ()
var email string
bb, err := command.Output()
if err != nil {
// get the email manually
prompt := "Email"
email, err = ux.Input(prompt, "", "Your Email Address")
command.Env = os.Environ()
var email string
bb, err := command.Output()
if err != nil {
return user, err
}
user.Email = email
} else {
email = strings.TrimSpace(string(bb))
use, err = ux.Confirm("Use detected email: " + email)
if err != nil {
return user, err
}
if use {
// get the email manually
prompt := "Email"
email, err = ux.Input(prompt, "", "Your Email Address")
if err != nil {
return user, err
}
user.Email = email
} else {
prompt := "Email"
uemail, err := ux.Input(prompt, "", "Your Email Address")
email = strings.TrimSpace(string(bb))
use, err = ux.Confirm("Use detected email: " + email)
if err != nil {
return user, err
}
user.Email = uemail
if use {
user.Email = email
} else {
prompt := "Email"
uemail, err := ux.Input(prompt, "", "Your Email Address")
if err != nil {
return user, err
}
user.Email = uemail
}
}
} else {
user.Email = envmail
}
envpubkey := os.Getenv("FLEEK_USER_PUBKEY")
envprivkey := os.Getenv("FLEEK_USER_PRIVKEY")
if (envpubkey == "") && (envprivkey == "") {

// ssh keys
privateKey := ""
publicKey := ""
// ssh keys
privateKey := ""
publicKey := ""

// find and add ssh keys
sshDir := filepath.Join(os.Getenv("HOME"), ".ssh")
sshFiles, err := os.ReadDir(sshDir)
hasSSH := true
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
hasSSH = false
} else {
return user, err
}
}
if hasSSH {
candidates := []string{}
for _, f := range sshFiles {
if strings.HasSuffix(f.Name(), ".pub") {
candidates = append(candidates, f.Name())
// find and add ssh keys
sshDir := filepath.Join(os.Getenv("HOME"), ".ssh")
sshFiles, err := os.ReadDir(sshDir)
hasSSH := true
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
hasSSH = false
} else {
return user, err
}
}
if len(candidates) > 0 {
key, err := ux.PromptSingle("Choose Git SSH Key", candidates)
if err != nil {
return user, err
if hasSSH {
candidates := []string{}
for _, f := range sshFiles {
if strings.HasSuffix(f.Name(), ".pub") {
candidates = append(candidates, f.Name())
}
}
if len(candidates) > 0 {
key, err := ux.PromptSingle("Choose Git SSH Key", candidates)
if err != nil {
return user, err
}
privateKey = strings.Replace(key, ".pub", "", 1)
privateKey = filepath.Join("~", ".ssh", privateKey)
publicKey = filepath.Join("~", ".ssh", key)
user.SSHPrivateKeyFile = privateKey
user.SSHPublicKeyFile = publicKey
}
privateKey = strings.Replace(key, ".pub", "", 1)
privateKey = filepath.Join("~", ".ssh", privateKey)
publicKey = filepath.Join("~", ".ssh", key)
user.SSHPrivateKeyFile = privateKey
user.SSHPublicKeyFile = publicKey
}
} else {
user.SSHPrivateKeyFile = envprivkey
user.SSHPublicKeyFile = envpubkey
}

return user, nil
Expand Down