diff --git a/readme.md b/readme.md index c1550fc..5c32038 100644 --- a/readme.md +++ b/readme.md @@ -125,6 +125,7 @@ Handle project workflows in a unified way: | Variable | Description | Default | |:------------------|:-------------------------|:--------------------------------| | SPCD_CA_n | Numbered CA certificates | | +| SPCD_CMD_SUM | Command to check sums | sha512sum | | SPCD_DNS_n | Numbered name servers | 9.9.9.9 | | SPCD_GIT_RWX | RWX Git repository | rwx | | SPCD_GIT_SHUNIT | ShUnit Git repository | shunit2 | diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 4e3b7a2..70a3673 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -4,8 +4,6 @@ # │ _ │ # ╰───╯ -_SPCD_CMD_SUM="sha512sum" - _spcd_fill() { local index="${1}" while [ "${index}" -gt 0 ]; do @@ -394,6 +392,7 @@ SPCD_PM_ZYPPER="zypper" spcd_step__environment_defaults_print() { set -- \ \ + "CMD_SUM" \ \ "GIT_RWX" \ "GIT_SPCD" \ @@ -426,6 +425,7 @@ spcd_step__environment_defaults_print() { spcd_step__environment_defaults_set() { spcd_step "$(spcd_txt_get "set")" + [ -n "${SPCD_CMD_SUM}" ] || SPCD_CMD_SUM="sha512sum" [ -n "${SPCD_DNS_1}" ] || SPCD_DNS_1="9.9.9.9" @@ -1268,13 +1268,13 @@ spcd_step__python_modules() { spcd_step "Check" script="${path}/bootstrap.sh" ls -l "${script}" - check="${script}.${_SPCD_CMD_SUM}" - "${_SPCD_CMD_SUM}" "${script}" >"${check}" + check="${script}.${SPCD_CMD_SUM}" + "${SPCD_CMD_SUM}" "${script}" >"${check}" printf "%s" "${SPCD}" >"${script}" ls -l "${script}" dos2unix "${script}" ls -l "${script}" - "${_SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD" + "${SPCD_CMD_SUM}" -c "${check}" || spcd_error_ci "SPCD" spcd_step "Root" spcd_python_pip "${SPCD_GIT_RWX}" spcd_step "List" @@ -1312,7 +1312,7 @@ spcd_step__install_packages() { "|^#baseurl|baseurl|" done file="/etc/yum.repos.d/epel-cisco-openh264.repo" - if [ -f "${file}" ]; then + if [ -f "${spcd_spr__file}" ]; then spcd_os_sed "${file}" \ "|^enabled=1|enabled=0|" fi