From c1def0e7a80f4a8f6b9806e43b91c26756d21c04 Mon Sep 17 00:00:00 2001
From: JustAnotherArchivist <JustAnotherArchivist@users.noreply.github.com>
Date: Sat, 26 Sep 2020 18:45:34 +0000
Subject: [PATCH] Fix S3_WITH_LIST_URLS being defined (but empty) when
 --with-list-urls is not used

---
 s3-bucket-list-qwarc | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/s3-bucket-list-qwarc b/s3-bucket-list-qwarc
index dcfae80..f7a57e2 100755
--- a/s3-bucket-list-qwarc
+++ b/s3-bucket-list-qwarc
@@ -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"