cmd-fetch: rename `args` variable
Prep for next patch.
@@ -94,31 +94,33 @@ fi
prepare_build
-args=
+lock_args=
+extra_args=
if [ -n "${UPDATE_LOCKFILE}" ]; then
# Put this under tmprepo so it gets automatically chown'ed if needed
- args="--ex-write-lockfile-to=${tmprepo}/tmp/manifest-lock.json"
+ extra_args+=" --ex-write-lockfile-to=${tmprepo}/tmp/manifest-lock.json"
# Include the overrides in the resulting lockfile here; otherwise, we
# might not even be able to get a depsolve solely from the non-lockfile
# repos.
for lock in "${manifest_lock_overrides}" "${manifest_lock_arch_overrides}"; do
if [ -f "${lock}" ]; then
- args+=" --ex-lockfile=${lock}"
+ lock_args+=" --ex-lockfile=${lock}"
fi
done
else
for lock in "${manifest_lock}" "${manifest_lock_overrides}" "${manifest_lock_arch_overrides}"; do
if [ -f "${lock}" ]; then
- args+=" --ex-lockfile=${lock}"
+ lock_args+=" --ex-lockfile=${lock}"
fi
done
fi
if [ -n "${DRY_RUN}" ]; then
- args="${args} --dry-run"
+ extra_args+=" --dry-run"
fi
+
if [ -n "${STRICT}" ]; then
- args="${args} --ex-lockfile-strict"
+ extra_args+=" --ex-lockfile-strict"
fi
# By default, we ignore cosa overrides since they're temporary. With
@@ -129,7 +131,7 @@ fi
prepare_compose_overlays ${IGNORE_COSA_OVERRIDES_ARG}
# shellcheck disable=SC2086
-runcompose_tree --download-only ${args} ${FORCE_ARG}
+runcompose_tree --download-only ${lock_args} ${extra_args} ${FORCE_ARG}
# This stamp file signifies we successfully fetched once; it's
# validated in cmd-build.
touch "${fetch_stamp}"
