Browse Source

Fix S3_WITH_LIST_URLS being defined (but empty) when --with-list-urls is not used

master
JustAnotherArchivist 3 years ago
parent
commit
c1def0e7a8
1 changed files with 9 additions and 6 deletions
  1. +9
    -6
      s3-bucket-list-qwarc

+ 9
- 6
s3-bucket-list-qwarc View File

@@ -232,10 +232,13 @@ printf '%s' "${code[@]# }" >"${prefix}.py" # That's a tab character after the h
# Generate the markers file
{ if [[ -z "${noStartMarker}" ]]; then echo; fi; printf '%s\n' "$@"; if [[ -z "${noEndMarker}" ]]; then echo; fi; } >"${prefix}-markers"

# Collect environment variables
envvars=()
envvars+=(S3BL_CMD="${cmd}")
envvars+=(S3_FORMAT="${format}")
envvars+=(S3_BUCKET_URL="${bucketUrl}")
envvars+=(S3_MARKERS_FILENAME="${prefix}-markers")
if [[ "${listUrls}" ]]; then envvars+=(S3_WITH_LIST_URLS="${listUrls}"); fi

# Lift-off!
S3BL_CMD="${cmd}" \
S3_FORMAT="${format}" \
S3_BUCKET_URL="${bucketUrl}" \
S3_MARKERS_FILENAME="${prefix}-markers" \
S3_WITH_LIST_URLS="${listUrls}" \
qwarc --concurrency "${concurrency}" --database "${prefix}.db" --log "${prefix}.log" --warc "${prefix}" "${prefix}.py"
env "${envvars[@]}" qwarc --concurrency "${concurrency}" --database "${prefix}.db" --log "${prefix}.log" --warc "${prefix}" "${prefix}.py"

Loading…
Cancel
Save