Allow import-messages to read from stdin
This commit is contained in:
parent
9876df6309
commit
eed76df6b5
|
@ -175,7 +175,7 @@ Commands:
|
||||||
carddav Run hydroxide as a CardDAV server
|
carddav Run hydroxide as a CardDAV server
|
||||||
export-secret-keys <username> Export secret keys
|
export-secret-keys <username> Export secret keys
|
||||||
imap Run hydroxide as an IMAP server
|
imap Run hydroxide as an IMAP server
|
||||||
import-messages <username> <file> Import messages
|
import-messages <username> [file] Import messages
|
||||||
export-messages [options...] <username> Export messages
|
export-messages [options...] <username> Export messages
|
||||||
sendmail <username> -- <args...> sendmail(1) interface
|
sendmail <username> -- <args...> sendmail(1) interface
|
||||||
serve Run all servers
|
serve Run all servers
|
||||||
|
@ -398,15 +398,18 @@ func main() {
|
||||||
importMessagesCmd.Parse(flag.Args()[1:])
|
importMessagesCmd.Parse(flag.Args()[1:])
|
||||||
username := importMessagesCmd.Arg(0)
|
username := importMessagesCmd.Arg(0)
|
||||||
archivePath := importMessagesCmd.Arg(1)
|
archivePath := importMessagesCmd.Arg(1)
|
||||||
if username == "" || archivePath == "" {
|
if username == "" {
|
||||||
log.Fatal("usage: hydroxide import-messages <username> <file>")
|
log.Fatal("usage: hydroxide import-messages <username> [file]")
|
||||||
}
|
}
|
||||||
|
|
||||||
f, err := os.Open(archivePath)
|
f := os.Stdin
|
||||||
if err != nil {
|
if archivePath != "" {
|
||||||
log.Fatal(err)
|
f, err = os.Open(archivePath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
}
|
}
|
||||||
defer f.Close()
|
|
||||||
|
|
||||||
bridgePassword, err := askBridgePass()
|
bridgePassword, err := askBridgePass()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue