jm0: centralize runtime config defaults

8 files changed, 56 insertions, 56 deletions

diff --git a/src/lib/action.source.sh b/src/lib/action.source.sh
index a041c9a..987fd7a 100644
--- a/src/lib/action.source.sh
+++ b/src/lib/action.source.sh
@@ -154,12 +154,12 @@ log_configured_action() {
     log_verbose "Effective incoming directory: ${INCOMING_DIR:-}"
     log_verbose "Effective output directory: ${DIST_DIR:-}"
     log_verbose "Effective template directory: ${TEMPLATE_DIR:-}"
-    log_verbose "Effective image jobs: ${IMAGE_JOBS:-3}"
-    log_verbose "Effective ImageMagick timeout: ${IMAGEMAGICK_TIMEOUT:-60}s"
-    log_verbose "Effective tar timeout: ${TAR_TIMEOUT:-120}s"
-    log_verbose "Effective splash page setting: ${SPLASH_PAGE:-yes}"
-    log_verbose "Effective tarball setting: ${TARBALL_INCLUDE:-no}"
-    log_verbose "Effective sync delete setting: ${SYNC_DELETE:-yes}"
+    log_verbose "Effective image jobs: $IMAGE_JOBS"
+    log_verbose "Effective ImageMagick timeout: ${IMAGEMAGICK_TIMEOUT}s"
+    log_verbose "Effective tar timeout: ${TAR_TIMEOUT}s"
+    log_verbose "Effective splash page setting: $SPLASH_PAGE"
+    log_verbose "Effective tarball setting: $TARBALL_INCLUDE"
+    log_verbose "Effective sync delete setting: $SYNC_DELETE"
     log_verbose "Effective force generation setting: $SHURIKEN_FORCE_GENERATE"
 }
 
diff --git a/src/lib/album.source.sh b/src/lib/album.source.sh
index 625d33a..6043fe0 100644
--- a/src/lib/album.source.sh
+++ b/src/lib/album.source.sh
@@ -567,7 +567,7 @@ render_album_index() {
     local -r blurs_dir="$1"; shift
     local -r backhref="$1"; shift
 
-    if [ "${SPLASH_PAGE:-yes}" = yes ]; then
+    if [ "$SPLASH_PAGE" = yes ]; then
         render_album_splash_page "$photos_dir" "$html_dir" "$blurs_dir" \
             "$backhref"
     else
@@ -826,7 +826,7 @@ tarball_name_plan() {
     local base
 
     base=$(basename "$INCOMING_DIR")
-    printf '%s-<timestamp>%s\n' "$base" "${TARBALL_SUFFIX:-.tar}"
+    printf '%s-<timestamp>%s\n' "$base" "$TARBALL_SUFFIX"
 }
 
 generated_tarball_name() {
@@ -835,7 +835,7 @@ generated_tarball_name() {
 
     base=$(basename "$INCOMING_DIR")
     timestamp=$(current_timestamp_slug)
-    printf '%s-%s%s\n' "$base" "$timestamp" "${TARBALL_SUFFIX:-.tar}"
+    printf '%s-%s%s\n' "$base" "$timestamp" "$TARBALL_SUFFIX"
 }
 
 count_tree_files() {
@@ -857,7 +857,7 @@ _collect_generation_metadata() {
     _GENERATION_METADATA["generator_name"]='shuriken'
     _GENERATION_METADATA["generator_version"]="$VERSION"
     _GENERATION_METADATA["generated_at"]=$(current_timestamp_iso)
-    _GENERATION_METADATA["config_source"]="${SHURIKEN_CONFIG_SOURCE:-}"
+    _GENERATION_METADATA["config_source"]="$SHURIKEN_CONFIG_SOURCE"
     _GENERATION_METADATA["template_name"]=$(basename "$TEMPLATE_DIR")
     _GENERATION_METADATA["template_directory"]="$TEMPLATE_DIR"
     _GENERATION_METADATA["source_incoming_dir"]="$INCOMING_DIR"
@@ -867,17 +867,17 @@ _collect_generation_metadata() {
     _GENERATION_METADATA["generated_html_count"]=$(
         count_tree_files "$DIST_DIR" '*.html'
     )
-    _GENERATION_METADATA["tarball_included"]="${TARBALL_INCLUDE:-no}"
+    _GENERATION_METADATA["tarball_included"]="$TARBALL_INCLUDE"
     _GENERATION_METADATA["tarball_file"]="$tarball_file"
-    _GENERATION_METADATA["settings_title"]="${TITLE:-}"
-    _GENERATION_METADATA["settings_height"]="${HEIGHT:-}"
-    _GENERATION_METADATA["settings_thumbheight"]="${THUMBHEIGHT:-}"
-    _GENERATION_METADATA["settings_maxpreviews"]="${MAXPREVIEWS:-}"
-    _GENERATION_METADATA["settings_image_jobs"]="${IMAGE_JOBS:-}"
-    _GENERATION_METADATA["settings_random_seed"]="${RANDOM_SEED:-}"
-    _GENERATION_METADATA["settings_shuffle"]="${SHUFFLE:-no}"
-    _GENERATION_METADATA["settings_splash_page"]="${SPLASH_PAGE:-yes}"
-    _GENERATION_METADATA["settings_original_basepath"]="${ORIGINAL_BASEPATH:-}"
+    _GENERATION_METADATA["settings_title"]="$TITLE"
+    _GENERATION_METADATA["settings_height"]="$HEIGHT"
+    _GENERATION_METADATA["settings_thumbheight"]="$THUMBHEIGHT"
+    _GENERATION_METADATA["settings_maxpreviews"]="$MAXPREVIEWS"
+    _GENERATION_METADATA["settings_image_jobs"]="$IMAGE_JOBS"
+    _GENERATION_METADATA["settings_random_seed"]="$RANDOM_SEED"
+    _GENERATION_METADATA["settings_shuffle"]="$SHUFFLE"
+    _GENERATION_METADATA["settings_splash_page"]="$SPLASH_PAGE"
+    _GENERATION_METADATA["settings_original_basepath"]="$ORIGINAL_BASEPATH"
 }
 
 _generation_metadata_json() {
@@ -985,7 +985,7 @@ clear_rendered_html() {
 create_generation_archive() {
     local -r tarball_name="$1"; shift
 
-    if [ "${TARBALL_INCLUDE:-no}" = yes ]; then
+    if [ "$TARBALL_INCLUDE" = yes ]; then
         tarball "$tarball_name"
     fi
 }
@@ -993,7 +993,7 @@ create_generation_archive() {
 generate() {
     local tarball_name=''
 
-    if [ "${TARBALL_INCLUDE:-no}" = yes ]; then
+    if [ "$TARBALL_INCLUDE" = yes ]; then
         tarball_name=$(generated_tarball_name)
         log_verbose \
             "Tarball enabled; planned archive:" \
@@ -1074,21 +1074,21 @@ dry_run() {
     fi
 
     printf 'Dry run: no files will be written.\n'
-    printf 'Config source: %s\n' "${SHURIKEN_CONFIG_SOURCE:-}"
+    printf 'Config source: %s\n' "$SHURIKEN_CONFIG_SOURCE"
     printf 'Incoming directory: %s\n' "$INCOMING_DIR"
     printf 'Output directory: %s\n' "$DIST_DIR"
     printf 'Template directory: %s\n' "$TEMPLATE_DIR"
     printf 'Title: %s\n' "$TITLE"
-    printf 'Height: %s\n' "${HEIGHT:-}"
+    printf 'Height: %s\n' "$HEIGHT"
     printf 'Thumb height: %s\n' "$THUMBHEIGHT"
     printf 'Max previews per page: %s\n' "$MAXPREVIEWS"
     printf 'Image jobs: %s\n' "$IMAGE_JOBS"
-    printf 'Random seed: %s\n' "${RANDOM_SEED:-}"
-    printf 'Shuffle: %s\n' "${SHUFFLE:-no}"
-    printf 'Splash page: %s\n' "${SPLASH_PAGE:-yes}"
+    printf 'Random seed: %s\n' "$RANDOM_SEED"
+    printf 'Shuffle: %s\n' "$SHUFFLE"
+    printf 'Splash page: %s\n' "$SPLASH_PAGE"
     printf 'Image count: %s\n' "$image_count"
-    printf 'Tarball setting: %s\n' "${TARBALL_INCLUDE:-no}"
-    if [ "${TARBALL_INCLUDE:-no}" = yes ]; then
+    printf 'Tarball setting: %s\n' "$TARBALL_INCLUDE"
+    if [ "$TARBALL_INCLUDE" = yes ]; then
         printf 'Tarball name plan: %s\n' "$(tarball_name_plan)"
     else
         printf 'Tarball name plan: not planned\n'
@@ -1101,7 +1101,7 @@ dry_run() {
     printf '  %s/blurs\n' "$DIST_DIR"
 
     printf 'Planned generated files:\n'
-    if [ "${SPLASH_PAGE:-yes}" = yes ]; then
+    if [ "$SPLASH_PAGE" = yes ]; then
         printf '  %s/index.html (%s splash page)\n' \
             "$DIST_DIR" "$html_index_count"
     else
@@ -1120,7 +1120,7 @@ dry_run() {
         "$DIST_DIR" "$details_count"
     printf '  %s/[redirect].html (%s navigation redirects)\n' \
         "$DIST_DIR" "$redirect_count"
-    if [ "${TARBALL_INCLUDE:-no}" = yes ]; then
+    if [ "$TARBALL_INCLUDE" = yes ]; then
         printf '  %s/%s\n' "$DIST_DIR" "$(tarball_name_plan)"
     fi
 }
diff --git a/src/lib/config.print.source.sh b/src/lib/config.print.source.sh
index 1950a26..bad29ef 100644
--- a/src/lib/config.print.source.sh
+++ b/src/lib/config.print.source.sh
@@ -23,24 +23,24 @@ print_config() {
     resolve_tar_opts tar_opts
     resolve_sync_destinations sync_destinations
 
-    print_shell_assignment CONFIG_SOURCE "${SHURIKEN_CONFIG_SOURCE:-}"
+    print_shell_assignment CONFIG_SOURCE "$SHURIKEN_CONFIG_SOURCE"
     print_shell_assignment INCOMING_DIR "$INCOMING_DIR"
     print_shell_assignment DIST_DIR "$DIST_DIR"
     print_shell_assignment TEMPLATE_DIR "$TEMPLATE_DIR"
     print_shell_assignment TITLE "$TITLE"
-    print_shell_assignment HEIGHT "${HEIGHT:-}"
+    print_shell_assignment HEIGHT "$HEIGHT"
     print_shell_assignment THUMBHEIGHT "$THUMBHEIGHT"
     print_shell_assignment MAXPREVIEWS "$MAXPREVIEWS"
     print_shell_assignment IMAGE_JOBS "$IMAGE_JOBS"
     print_shell_assignment IMAGEMAGICK_TIMEOUT "$IMAGEMAGICK_TIMEOUT"
-    print_shell_assignment RANDOM_SEED "${RANDOM_SEED:-}"
-    print_shell_assignment SHUFFLE "${SHUFFLE:-no}"
-    print_shell_assignment SPLASH_PAGE "${SPLASH_PAGE:-yes}"
-    print_shell_assignment TARBALL_INCLUDE "${TARBALL_INCLUDE:-no}"
-    print_shell_assignment TARBALL_SUFFIX "${TARBALL_SUFFIX:-.tar}"
+    print_shell_assignment RANDOM_SEED "$RANDOM_SEED"
+    print_shell_assignment SHUFFLE "$SHUFFLE"
+    print_shell_assignment SPLASH_PAGE "$SPLASH_PAGE"
+    print_shell_assignment TARBALL_INCLUDE "$TARBALL_INCLUDE"
+    print_shell_assignment TARBALL_SUFFIX "$TARBALL_SUFFIX"
     print_shell_assignment TAR_TIMEOUT "$TAR_TIMEOUT"
     print_shell_array_assignment TAR_OPTS "${tar_opts[@]}"
-    print_shell_assignment SYNC_DELETE "${SYNC_DELETE:-yes}"
+    print_shell_assignment SYNC_DELETE "$SYNC_DELETE"
     print_shell_array_assignment SYNC_DESTINATIONS "${sync_destinations[@]}"
-    print_shell_assignment ORIGINAL_BASEPATH "${ORIGINAL_BASEPATH:-}"
+    print_shell_assignment ORIGINAL_BASEPATH "$ORIGINAL_BASEPATH"
 }
diff --git a/src/lib/config.sync.source.sh b/src/lib/config.sync.source.sh
index d2256d3..b9362ac 100644
--- a/src/lib/config.sync.source.sh
+++ b/src/lib/config.sync.source.sh
@@ -5,7 +5,7 @@ sync_dist() {
 
     resolve_sync_destinations sync_destinations
 
-    if [ "${SYNC_DELETE:-yes}" = yes ]; then
+    if [ "$SYNC_DELETE" = yes ]; then
         rsync_args+=(--delete)
     fi
 
diff --git a/src/lib/config.validate.source.sh b/src/lib/config.validate.source.sh
index 58a2ee3..7988821 100644
--- a/src/lib/config.validate.source.sh
+++ b/src/lib/config.validate.source.sh
@@ -107,7 +107,7 @@ validate_template_dir() {
 
     validate_template_dir_access || return
 
-    if [ "${SPLASH_PAGE:-yes}" = yes ]; then
+    if [ "$SPLASH_PAGE" = yes ]; then
         required_templates+=(splash)
     fi
 
@@ -130,7 +130,7 @@ validate_refresh_splash_config() {
 
     validate_yes_no_config_var SPLASH_PAGE || return
 
-    if [ "${SPLASH_PAGE:-yes}" != yes ]; then
+    if [ "$SPLASH_PAGE" != yes ]; then
         config_error 'SPLASH_PAGE must be yes to refresh the splash page'
         return 1
     fi
diff --git a/src/lib/image.source.sh b/src/lib/image.source.sh
index 493f0a0..568ab62 100644
--- a/src/lib/image.source.sh
+++ b/src/lib/image.source.sh
@@ -191,7 +191,7 @@ wait_for_image_job_slot() {
     wait_for_parallel_job_slot \
         "$image_job_pids_name" \
         "$failed_name" \
-        "${IMAGE_JOBS:-3}"
+        "$IMAGE_JOBS"
 }
 
 wait_for_image_jobs() {
@@ -208,7 +208,7 @@ wait_for_template_render_job_slot() {
     wait_for_parallel_job_slot \
         "$render_job_pids_name" \
         "$failed_name" \
-        "${IMAGE_JOBS:-3}"
+        "$IMAGE_JOBS"
 }
 
 wait_for_template_render_jobs() {
@@ -233,7 +233,7 @@ scale_photo() {
     fi
 
     log_info "Processing $photo to $(_display_path "$destphoto")"
-    if [ -n "${HEIGHT:-}" ]; then
+    if [ -n "$HEIGHT" ]; then
         # Scale down size.
         imagemagick \
             "$INCOMING_DIR/$photo" \
@@ -250,7 +250,7 @@ scale_photo() {
 }
 
 random_seed_is_set() {
-    [ -n "${RANDOM_SEED:-}" ]
+    [ -n "$RANDOM_SEED" ]
 }
 
 deterministic_index() {
@@ -313,7 +313,7 @@ deterministic_shuffle() {
 }
 
 maybe_shuffle() {
-    if [ "${SHUFFLE:-no}" = yes ]; then
+    if [ "$SHUFFLE" = yes ]; then
         if random_seed_is_set; then
             deterministic_shuffle
         else
diff --git a/src/lib/system.source.sh b/src/lib/system.source.sh
index 9fad90b..5d6f8e7 100644
--- a/src/lib/system.source.sh
+++ b/src/lib/system.source.sh
@@ -97,7 +97,7 @@ run_with_timeout() {
 
 tarball() {
     local -r tarball_name="$1"; shift
-    local -r tarball_suffix="${TARBALL_SUFFIX:-.tar}"
+    local -r tarball_suffix="$TARBALL_SUFFIX"
     local base
     local old_tarball
     local -a tar_opts=()
diff --git a/src/lib/template.source.sh b/src/lib/template.source.sh
index c7d9ded..f24244b 100644
--- a/src/lib/template.source.sh
+++ b/src/lib/template.source.sh
@@ -427,19 +427,19 @@ prepare_template_render_vars() {
             config_html)
                 case "$source_name" in
                     HEIGHT)
-                        context_value="${HEIGHT:-}"
+                        context_value="$HEIGHT"
                         ;;
                     MAXPREVIEWS)
-                        context_value="${MAXPREVIEWS:-}"
+                        context_value="$MAXPREVIEWS"
                         ;;
                     ORIGINAL_BASEPATH)
-                        context_value="${ORIGINAL_BASEPATH:-}"
+                        context_value="$ORIGINAL_BASEPATH"
                         ;;
                     THUMBHEIGHT)
-                        context_value="${THUMBHEIGHT:-}"
+                        context_value="$THUMBHEIGHT"
                         ;;
                     TITLE)
-                        context_value="${TITLE:-}"
+                        context_value="$TITLE"
                         ;;
                     *)
                         config_error \
@@ -450,7 +450,7 @@ prepare_template_render_vars() {
                 html_escape_to render_value "$context_value"
                 ;;
             original_basepath_is_set)
-                if [ -n "${ORIGINAL_BASEPATH:-}" ]; then
+                if [ -n "$ORIGINAL_BASEPATH" ]; then
                     render_value='yes'
                 else
                     render_value='no'
@@ -475,7 +475,7 @@ prepare_template_render_vars() {
                 fi
                 ;;
             tarball_include)
-                render_value="${TARBALL_INCLUDE:-no}"
+                render_value="$TARBALL_INCLUDE"
                 ;;
             *)
                 config_error "unknown template render field kind $kind"