main: print clear error message if CIPHERDIR is missing
Getting just the help text in response to gocryptfs -info -config external.config is confusing: https://github.com/rfjakob/gocryptfs/issues/157
This commit is contained in:
parent
e36a0ebf18
commit
1b0426bcb2
2
info.go
2
info.go
@ -20,7 +20,7 @@ func info(filename string) {
|
||||
// Read from disk
|
||||
js, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
tlog.Fatal.Printf("info: ReadFile: %#v\n", err)
|
||||
tlog.Fatal.Printf("Reading config file failed: %v", err)
|
||||
os.Exit(exitcodes.LoadConf)
|
||||
}
|
||||
// Unmarshal
|
||||
|
25
main.go
25
main.go
@ -143,18 +143,25 @@ func main() {
|
||||
tlog.Warn.Wpanic = true
|
||||
tlog.Debug.Printf("Panicing on warnings")
|
||||
}
|
||||
// Every operation below requires CIPHERDIR. Check that we have it.
|
||||
if flagSet.NArg() >= 1 {
|
||||
args.cipherdir, _ = filepath.Abs(flagSet.Arg(0))
|
||||
err = checkDir(args.cipherdir)
|
||||
if err != nil {
|
||||
tlog.Fatal.Printf("Invalid cipherdir: %v", err)
|
||||
os.Exit(exitcodes.CipherDir)
|
||||
// Every operation below requires CIPHERDIR. Exit if we don't have it.
|
||||
if flagSet.NArg() == 0 {
|
||||
if flagSet.NFlag() == 0 {
|
||||
// Naked call to "gocryptfs". Just print the help text.
|
||||
helpShort()
|
||||
} else {
|
||||
// The user has passed some flags, but CIPHERDIR is missing. State
|
||||
// what is wrong.
|
||||
tlog.Fatal.Printf("CIPHERDIR argument is missing")
|
||||
}
|
||||
} else {
|
||||
helpShort()
|
||||
os.Exit(exitcodes.Usage)
|
||||
}
|
||||
// Check that CIPHERDIR exists
|
||||
args.cipherdir, _ = filepath.Abs(flagSet.Arg(0))
|
||||
err = checkDir(args.cipherdir)
|
||||
if err != nil {
|
||||
tlog.Fatal.Printf("Invalid cipherdir: %v", err)
|
||||
os.Exit(exitcodes.CipherDir)
|
||||
}
|
||||
// "-q"
|
||||
if args.quiet {
|
||||
tlog.Info.Enabled = false
|
||||
|
Loading…
x
Reference in New Issue
Block a user