From 3d18927234445d5355fb05914c203d6dafa3d656 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Mon, 30 Mar 2015 02:24:29 +0200 Subject: Document the configuration syntax. --- cli/icevault | 2 +- cli/icevault.1 | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cli/icevault b/cli/icevault index e4c517a..8a313ca 100755 --- a/cli/icevault +++ b/cli/icevault @@ -129,7 +129,7 @@ sub loadConfig() { chomp; s/#.*//; # ignore comments next if /^\s*$/; # ignore empty and blank lines - /^([-\@a-zA-Z0-9.]+)(?:\s*=\s*)(\p{Print}+)/ or error "Can't parse config line: C<%s>", $_; + /^([-\@a-zA-Z0-9.]+)\s*=\s*(\p{Graph}\p{Print}*)/ or error "Can't parse config line: C<%s>", $_; $CONFIG{$1} //= $2; } close $CONFIG; diff --git a/cli/icevault.1 b/cli/icevault.1 index d1a2084..81c8322 100644 --- a/cli/icevault.1 +++ b/cli/icevault.1 @@ -173,8 +173,12 @@ Show the version number and exit. \fBicevault\fR reads it configuration from \fI$XDG_CONFIG_HOME/icevault\fR, or \fI~/.config/icevault\fR if -XDG_CONFIG_HOME is unset. -Empty lines and comments (starting with a "#" characters are ignored). +the XDG_CONFIG_HOME environment variable is unset. +Options given on the command line override those found in the +configuration file. +The syntax of the configuration file is a serie of +\fIOPTION\fR=\fIVALUE\fR lines; +everything after a "#" is considered a comment and ignored. Valid options are: .TP -- cgit v1.2.3