diff --git a/main.go b/main.go index 5ae8146..2033e23 100644 --- a/main.go +++ b/main.go @@ -214,6 +214,15 @@ func main() { } changePassword(&args) // does not return } - // Mount + // Default operation: mount. + if flagSet.NArg() != 2 { + prettyArgs := fmt.Sprintf("%q", os.Args[1:]) + // Get rid of "[" and "]" + prettyArgs = prettyArgs[1 : len(prettyArgs)-1] + tlog.Info.Printf("Wrong number of arguments (have %d, want 2). You passed: %s", + flagSet.NArg(), prettyArgs) + tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT", tlog.ProgramName) + os.Exit(ErrExitUsage) + } os.Exit(doMount(&args)) } diff --git a/mount.go b/mount.go index 3157332..803b09b 100644 --- a/mount.go +++ b/mount.go @@ -26,10 +26,6 @@ import ( // Called from main. func doMount(args *argContainer) int { // Check mountpoint - if flagSet.NArg() != 2 { - tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT", tlog.ProgramName) - os.Exit(ErrExitUsage) - } var err error args.mountpoint, err = filepath.Abs(flagSet.Arg(1)) if err != nil {