cd.sh

@@ -23,7 +23,7 @@ case "${CD_OS_NAME}" in
 esac
 CD_STEP=0
 
-function cd_step {
+function step {
     if [ "${1}" ] ; then
         ((CD_STEP++))
         echo "
@@ -32,29 +32,14 @@ function cd_step {
     fi
 }
 
-function cd_write {
+step "set name servers"
-local file="${1}"
+for server in "${CD_DNS_SERVERS[@]}" ; do
-local text="${2}"
+    echo "nameserver ${server}" \
-    if [ "${file}" ] ; then
+    >> "${CD_DNS_FILE}" \
-        echo -n "${text}" \
-        > "${file}" \
-        || exit
-    fi
-}
-
-function cd_set_dns {
-local server
-local text=''
-    cd_step "set name servers"
-    for server in "${CD_DNS_SERVERS[@]}" ; do
-        text+="nameserver ${server}
-"
-    done
-    cd_write "${CD_DNS_FILE}" "${text}" \
     || exit
-}
+done
 
-cd_step "configure package manager"
+step "configure package manager"
 echo -n "\
 Acquire::Check-Valid-Until True;
 APT::Get::Show-Versions True;
@@ -63,7 +48,7 @@ APT::Install-Suggests False;
 Dir::Etc::SourceParts '';
 " > '/etc/apt/apt.conf.d/apt.conf' \
 || exit
-cd_step "configure package repositories"
+step "configure package repositories"
 echo -n "\
 deb https://deb.debian.org/debian bookworm main
 deb https://deb.debian.org/debian bookworm-backports main
@@ -72,52 +57,45 @@ deb https://deb.debian.org/debian-security bookworm-security main
 " > '/etc/apt/sources.list' \
 || exit
 
-cd_step "disable package verification"
+step "disable package verification"
 echo -n "\
 Acquire::https::Verify-Peer False;
 " > '/etc/apt/apt.conf.d/https' \
 || exit
-cd_step "update package catalog"
+step "update package catalog"
 apt-get update \
 || exit
-cd_step "install CA certificates package"
+step "install CA certificates package"
 apt-get install --yes 'ca-certificates' \
 || exit
-cd_step "enable package verification"
+step "enable package verification"
 rm '/etc/apt/apt.conf.d/https' \
 || exit
 
-cd_step "update package catalog"
+step "update package catalog"
 apt-get update \
 || exit
-cd_step "upgrade packages"
+step "upgrade packages"
 apt-get upgrade --yes \
 || exit
 
-cd_step "install Git"
+step "install Git"
 apt-get install --yes 'git' \
 || exit
 
 DIRECTORY="$(mktemp --directory)" \
 || exit
-cd_step "clone Continuous Delivery"
+step "clone Continuous Delivery"
 git clone \
 "${GITHUB_SERVER_URL}/${CD_REPOSITORY}" \
 "${DIRECTORY}" \
 || exit
 
-cd_step "install Python"
+step "install Python"
 apt-get install --yes 'python3' \
 || exit
-cd_step "clean package cache"
+step "clean package cache"
 apt-get clean \
 || exit
-cd_step "bootstrap"
+step "bootstrap"
 "${DIRECTORY}/bootstrap.sh"
-
-
-function cd_main {
-    cd_set_dns
-}
-
-cd_main