modified: cmd/ssh-vault/main.go

ssh-vault · Feb 2, 2017 · 088564e · 088564e
1 parent ceabaad
commit 088564e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/cmd/ssh-vault/main.go b/cmd/ssh-vault/main.go
@@ -45,6 +45,10 @@ func main() {
 		os.Exit(0)
 	}
 
+	if flag.NArg() < 1 && !*f {
+		exit1(fmt.Errorf("Missing option, use (\"%s -h\") for help.\n", os.Args[0]))
+	}
+
 	usr, _ := user.Current()
 	if len(*k) > 2 {
 		if (*k)[:2] == "~/" {
@@ -54,12 +58,12 @@ func main() {
 
 	vault, err := sv.New(*k, *u, flag.Arg(0), flag.Arg(1))
 	if err != nil {
-		exit1(fmt.Errorf("%s, use (\"%s -h\") for help.\n", os.Args[0]))
+		exit1(err)
 	}
 
 	// ssh-keygen -f id_rsa.pub -e -m PKCS8
 	if err := vault.PKCS8(); err != nil {
-		exit1(fmt.Errorf("%s, use (\"%s -h\") for help.\n", os.Args[0]))
+		exit1(err)
 	}
 
 	// print fingerprint and exit
@@ -68,9 +72,6 @@ func main() {
 		os.Exit(0)
 	}
 
-	if flag.NArg() < 1 {
-		exit1(fmt.Errorf("Missing option, use (\"%s -h\") for help.\n", os.Args[0]))
-	}
 	// check options
 	exit := true
 	for _, v := range options {