Mirrors/go-chasquid-smtp
1
0
Fork 0
mirror of https://blitiri.com.ar/repos/chasquid synced 2025-12-17 14:37:02 +00:00
Code Releases Activity

Add @domain to chasquid-util --help where appropriate

Browse Source 
This makes it more clear how to specify which domain the user being
operated on is the sub-command targeting when using `--help`.

Amended-by: Alberto Bertogli <albertito@blitiri.com.ar>
  Update code to match the updated parameter name.
This commit is contained in:
Leandro Lucarella
2020-11-05 21:42:23 +01:00
committed by Alberto Bertogli
parent bb1b921e3c
commit c9d3ba0ca0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/chasquid-util/chasquid-util.go
View File

@@ -29,9 +29,9 @@ import (
// Usage, which doubles as parameter definitions thanks to docopt. // Usage, which doubles as parameter definitions thanks to docopt.
const usage = ` const usage = `
Usage: Usage:
chasquid-util [options] user-add <username> [--password=<password>] chasquid-util [options] user-add <user@domain> [--password=<password>]
chasquid-util [options] user-remove <username> chasquid-util [options] user-remove <user@domain>
chasquid-util [options] authenticate <username> [--password=<password>] chasquid-util [options] authenticate <user@domain> [--password=<password>]
chasquid-util [options] check-userdb <domain> chasquid-util [options] check-userdb <domain>
chasquid-util [options] aliases-resolve <address> chasquid-util [options] aliases-resolve <address>
chasquid-util [options] domaininfo-remove <domain> chasquid-util [options] domaininfo-remove <domain>
@@ -90,7 +90,7 @@ func userDBForDomain(domain string) string {
} }
func userDBFromArgs(create bool) (string, string, *userdb.DB) { func userDBFromArgs(create bool) (string, string, *userdb.DB) {
username := args["<username>"].(string) username := args["<user@domain>"].(string)
user, domain := envelope.Split(username) user, domain := envelope.Split(username)
if domain == "" { if domain == "" {
Fatalf("Domain missing, username should be of the form 'user@domain'") Fatalf("Domain missing, username should be of the form 'user@domain'")
@@ -127,7 +127,7 @@ func checkUserDB() {
fmt.Println("Database loaded") fmt.Println("Database loaded")
} }
// chasquid-util user-add <username> [--password=<password>] // chasquid-util user-add <user@domain> [--password=<password>]
func userAdd() { func userAdd() {
user, _, db := userDBFromArgs(true) user, _, db := userDBFromArgs(true)
password := getPassword() password := getPassword()
@@ -145,7 +145,7 @@ func userAdd() {
fmt.Println("Added user") fmt.Println("Added user")
} }
// chasquid-util authenticate <username> [--password=<password>] // chasquid-util authenticate <user@domain> [--password=<password>]
func authenticate() { func authenticate() {
user, _, db := userDBFromArgs(false) user, _, db := userDBFromArgs(false)
@@ -185,7 +185,7 @@ func getPassword() string {
return string(p1) return string(p1)
} }
// chasquid-util user-remove <username> // chasquid-util user-remove <user@domain>
func userRemove() { func userRemove() {
user, _, db := userDBFromArgs(false) user, _, db := userDBFromArgs(false)