diff --git a/cd.sh b/cd.sh index 618fc4d..e4796f3 100644 --- a/cd.sh +++ b/cd.sh @@ -22,18 +22,20 @@ case "${CD_OS_NAME}" in ;; esac -echo " - 1/14 set name servers +function split { + [ "${1}" ] && echo " +${1} " +} + +split " 1/14 set name servers" for server in "${CD_DNS_SERVERS[@]}" ; do echo "nameserver ${server}" \ >> "${CD_DNS_FILE}" \ || exit done -echo " - 2/14 configure package manager -" +split " 2/14 configure package manager" echo -n "\ Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; @@ -42,9 +44,7 @@ APT::Install-Suggests False; Dir::Etc::SourceParts ''; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit -echo " - 3/14 configure package repositories -" +split " 3/14 configure package repositories" echo -n "\ deb https://deb.debian.org/debian bookworm main deb https://deb.debian.org/debian bookworm-backports main @@ -53,67 +53,45 @@ deb https://deb.debian.org/debian-security bookworm-security main " > '/etc/apt/sources.list' \ || exit -echo " - 4/14 disable package verification -" +split " 4/14 disable package verification" echo -n "\ Acquire::https::Verify-Peer False; " > '/etc/apt/apt.conf.d/https' \ || exit -echo " - 5/14 update package catalog -" +split " 5/14 update package catalog" apt-get update \ || exit -echo " - 6/14 install CA certificates package -" +split " 6/14 install CA certificates package" apt-get install --yes 'ca-certificates' \ || exit -echo " - 7/14 enable package verification -" +split " 7/14 enable package verification" rm '/etc/apt/apt.conf.d/https' \ || exit -echo " - 8/14 update package catalog -" +split " 8/14 update package catalog" apt-get update \ || exit -echo " - 9/14 upgrade packages -" +split " 9/14 upgrade packages" apt-get upgrade --yes \ || exit -echo " -10/14 install Git -" +split "10/14 install Git" apt-get install --yes 'git' \ || exit DIRECTORY="$(mktemp --directory)" \ || exit -echo " -11/14 clone Continuous Delivery -" +split "11/14 clone Continuous Delivery" git clone \ "${GITHUB_SERVER_URL}/${CD_REPOSITORY}" \ "${DIRECTORY}" \ || exit -echo " -12/14 install Python -" +split "12/14 install Python" apt-get install --yes 'python3' \ || exit -echo " -13/14 clean package cache -" +split "13/14 clean package cache" apt-get clean \ || exit -echo " -14/14 bootstrap -" +split "14/14 bootstrap" "${DIRECTORY}/bootstrap.sh"