diff options
| author | Case Duckworth | 2023-01-08 00:14:51 -0600 |
|---|---|---|
| committer | Case Duckworth | 2023-01-08 00:14:51 -0600 |
| commit | 9aefd659aa0e55f38d62c5de34656bfdc797b12d (patch) | |
| tree | 1ab41d8d0c584d94cd3c8f35fabf6889f73b2709 | |
| parent | Update initialize() (diff) | |
| download | vienna-9aefd659aa0e55f38d62c5de34656bfdc797b12d.tar.gz vienna-9aefd659aa0e55f38d62c5de34656bfdc797b12d.zip | |
Miscellaneous fixes
| -rwxr-xr-x | vienna | 13 |
1 files changed, 4 insertions, 9 deletions
| diff --git a/vienna b/vienna index 4edbe11..19792f2 100755 --- a/vienna +++ b/vienna | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # vienna --- a tiny, tasty ssg | 2 | # vienna --- a tiny, tasty ssg |
| 3 | # by C. Duckworth <acdw@acdw.net> | 3 | # by C. Duckworth <acdw@acdw.net> |
| 4 | # shellcheck disable=1090,2035 | 4 | # shellcheck disable=1090,2030,2031,2035 |
| 5 | 5 | ||
| 6 | ### Entry point | 6 | ### Entry point |
| 7 | 7 | ||
| @@ -111,9 +111,8 @@ main() { | |||
| 111 | yornp "Continue building? (y/N)" || exit 2 | 111 | yornp "Continue building? (y/N)" || exit 2 |
| 112 | fi | 112 | fi |
| 113 | fi | 113 | fi |
| 114 | # Further argument processing --- pre-build | 114 | log vienna config |
| 115 | preprocess "$@" || shift | 115 | # Log configuration variables |
| 116 | ## Log configuration variables | ||
| 117 | log config domain: "$DOMAIN" | 116 | log config domain: "$DOMAIN" |
| 118 | log config workdir: "$WORKDIR" | 117 | log config workdir: "$WORKDIR" |
| 119 | log config output: "$OUTDIR" | 118 | log config output: "$OUTDIR" |
| @@ -156,11 +155,8 @@ preprocess() { | |||
| 156 | case "${1:-ok}" in | 155 | case "${1:-ok}" in |
| 157 | ok) ;; | 156 | ok) ;; |
| 158 | init) | 157 | init) |
| 159 | log vienna initializing... | ||
| 160 | shift | 158 | shift |
| 161 | initialize "$@" | 159 | initialize "$@" # exit |
| 162 | log vienna initialized. | ||
| 163 | exit | ||
| 164 | ;; | 160 | ;; |
| 165 | clean) | 161 | clean) |
| 166 | log vienna clean | 162 | log vienna clean |
| @@ -364,7 +360,6 @@ meta_init() { # meta_init FILE | |||
| 364 | ## Extract metadata from FILE for later processing. | 360 | ## Extract metadata from FILE for later processing. |
| 365 | # Metadata should exist as colon-separated data in HTML comments in the | 361 | # Metadata should exist as colon-separated data in HTML comments in the |
| 366 | # input file. | 362 | # input file. |
| 367 | metafile= | ||
| 368 | m=false | 363 | m=false |
| 369 | t=false | 364 | t=false |
| 370 | while read -r line; do | 365 | while read -r line; do |