diff options
| author | Paul Buetow <paul@buetow.org> | 2026-06-24 21:36:34 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-06-24 21:36:34 +0300 |
| commit | a79e7d77cc6717f6c5bfaaefa5361f396c322de3 (patch) | |
| tree | 1787b7d87a95f9b2a99626837f9b988dd5ee7f9a /src | |
| parent | fe89919d47296844364323e5b1dd9ce25511f3dd (diff) | |
Fix TARBALL_INCLUDE config default drift (7r0, scoped down)
apply_config_defaults fell back to TARBALL_INCLUDE=no while the user-facing
src/shuriken.default.conf documents (and --init writes) TARBALL_INCLUDE=yes.
The two disagreed, so an album generated from a config that omitted the key
silently dropped the tarball despite the documented default saying otherwise.
'yes' is the authoritative default: the original definition was
`declare -r TARBALL_INCLUDE=yes` (tarball inclusion was on from the start);
the ':-no' fallback was introduced later during a refactor and drifted from
the documented intent. Align apply_config_defaults to ':-yes' and add a
comment explaining the invariant and the history.
Tests: add test_tarball_include_default_matches_init_config asserting the
effective default agrees between a fresh --init config and apply_config_defaults
(and is 'yes'); update the omitted-runtime-defaults --print-config expectation
to the corrected 'yes'. bin/shuriken regenerated via just build.
This is the scoped-down drift fix only. The full CONFIG_SPECS registry plus
cfg_get/SHURIKEN_CFG access-layer rewrite proposed in 7r0 remains DEFERRED.
just test, just shellcheck, just check-generated and git diff --check all pass.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.source.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/config.source.sh b/src/lib/config.source.sh index 67ddade..9dd48ee 100644 --- a/src/lib/config.source.sh +++ b/src/lib/config.source.sh @@ -52,7 +52,11 @@ apply_config_defaults() { THUMB_SUBDIVIDE_PERCENT="${THUMB_SUBDIVIDE_PERCENT:-30}" THUMB_FEATURE_PERCENT="${THUMB_FEATURE_PERCENT:-10}" SYNC_DELETE="${SYNC_DELETE:-yes}" - TARBALL_INCLUDE="${TARBALL_INCLUDE:-no}" + # Default 'yes': a tarball of the incoming dir is included in the dist unless + # disabled. This must match the documented default in shuriken.default.conf + # (TARBALL_INCLUDE=yes) -- it previously drifted to 'no' here. 'yes' is the + # original, authoritative default (tarball inclusion was on from the start). + TARBALL_INCLUDE="${TARBALL_INCLUDE:-yes}" TARBALL_SUFFIX="${TARBALL_SUFFIX:-.tar}" TAR_TIMEOUT="${TAR_TIMEOUT:-120}" if ! declare -p TAR_OPTS >/dev/null 2>&1; then |