[PATCH 08/24] Eliminate shellcheck SC2029 warnings