summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-06-04 15:11:18 +0200
committerJakob Unterwurzacher2016-06-04 15:24:42 +0200
commit281bb8daf080d1b38a8079f5809232edc68aab0d (patch)
tree8e52a3fc8a1919a1ee3cb391768ac1b3f08d4977
parent72f8915843c5308336534d90286d2199c5d8932c (diff)
main: don't tell the user to choose a password when -extpass is used
Instead, print this: Using password provided via -extpass.
-rw-r--r--main.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/main.go b/main.go
index 6b3b6b6..e365d48 100644
--- a/main.go
+++ b/main.go
@@ -66,7 +66,11 @@ func initDir(args *argContainer) {
}
// Create gocryptfs.conf
- toggledlog.Info.Printf("Choose a password for protecting your files.")
+ if args.extpass == "" {
+ toggledlog.Info.Printf("Choose a password for protecting your files.")
+ } else {
+ toggledlog.Info.Printf("Using password provided via -extpass.")
+ }
password := readPasswordTwice(args.extpass)
err = configfile.CreateConfFile(args.config, password, args.plaintextnames, args.scryptn)
if err != nil {