add -q and better logic for -c

1 files changed, 23 insertions, 4 deletions

@@ -11,12 +11,14 @@ VIENNA: a tiny, tasty ssg
 by C. Duckworth <acdw@acdw.net>
 
 USAGE: vienna [-h]
-       vienna [-C DIR] [-d DOMAIN] [-o DIR] [COMMAND]
+       vienna [-q] [-c CONFIG] [-C DIR] [-d DOMAIN] [-o DIR] [COMMAND]
 
 FLAGS:
  -h         view this help
+ -q         don't output any diagnostic information
 
 OPTIONS:
+ -c CONFIG  source CONFIG instead of \$VIENNA_CONFIG when building
  -C DIR     operate in DIR, instead of \$PWD.
  -d DOMAIN  use DOMAIN as basis for urls. default: example.com
  -o DIR     output built site to DIR. default: ./out
@@ -54,12 +56,18 @@ configure() {
         # Logging
         LOG=true
         ## Parse command line arguments
-        while getopts d:C:o:hq opt; do
+        while getopts C:c:d:ho:q opt; do
                 case "$opt" in
-                d) DOMAIN="$OPTARG" ;;
                 C) WORKD="$OPTARG" ;;
-                o) OUTD="$OPTARG" ;;
+                c)
+                        CONFIG="$OPTARG"
+                        # To error later if a config is specified on the command
+                        # line but doesn't exist.
+                        CONFIG_ARG=1
+                        ;;
+                d) DOMAIN="$OPTARG" ;;
                 h) usage 0 ;;
+                o) OUTD="$OPTARG" ;;
                 q) LOG=false ;;
                 *) exit 1 ;;
                 esac
@@ -94,6 +102,17 @@ main() {
         # Prepare
         cd "$WORKD" || exit 2
         test -f "$CONFIG" && . "$CONFIG" # Source ./.vienna.sh, if it exists.
+        if test -f "$CONFIG"; then
+                # Source ./.vienna.sh, if it exists.
+                . "$CONFIG"
+        elif test -n "$CONFIG_ARG"; then
+                # If a -c option was passed on the command line but the file
+                # doesn't exist, that's an error.  If we're just looking for the
+                # default file, however, there is no error---the user might want
+                # to use the default configuration.
+                log "Can't find configuration \`$CONFIG'."
+                exit 2
+        fi
         mkdir -p "$OUTD" || exit 2
         mkdir -p "$TMPD" || exit 2
         # Build pages