[PATCH 06/24] Eliminate shellcheck SC2129 warnings