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