rwx.work/spcd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rwx.work:5774113c403444b341100561a8384d554cfa0b71
Branches Tags
rwx.work:main
rwx.work:dev
..
compare: rwx.work:f92d49fe82572ce69b794259c8108bfa7176c401
Branches Tags
rwx.work:main
rwx.work:dev

No commits in common. "5774113c403444b341100561a8384d554cfa0b71" and "f92d49fe82572ce69b794259c8108bfa7176c401" have entirely different histories.
5774113c40 ... f92d49fe82

1 changed files with 10 additions and 13 deletions
Show stats Expand all files Collapse all files

23
spcd/bootstrap.sh
View file

@ -1046,13 +1046,13 @@ spcd_packages_install_tools() {
# │ steps │ ca │ # │ steps │ ca │
# ╰───────┴────╯ # ╰───────┴────╯
spcd_ca_install_package() { spcd_install_ca_certificates() {
spcd_step "Install package" spcd_step "Install CA"
spcd_install_package "${SPCD_PKG_CA}" spcd_install_package "${SPCD_PKG_CA}"
} }
spcd_ca_write_certificates() { spcd_write_ca_certificates() {
spcd_step "Write certificates" spcd_step "Write CA certificates"
spcd_os_mkdir "${SPCD_CA_ROOT}" spcd_os_mkdir "${SPCD_CA_ROOT}"
while true; do while true; do
spcd_wcc__index=$((spcd_wcc__index + 1)) spcd_wcc__index=$((spcd_wcc__index + 1))
@ -1065,8 +1065,8 @@ spcd_ca_write_certificates() {
done done
} }
spcd_ca_update_certificates() { spcd_update_ca_certificates() {
spcd_step "Update certificates" spcd_step "Update CA certificates"
${SPCD_CMD_CA} ${SPCD_CMD_CA}
} }
@ -1224,11 +1224,10 @@ spcd_python_write_module() {
spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value} spcd_wpm__text="${spcd_wpm__text}${spcd_wpm__value}
" "
done done
eval "spcd_wpm__index=\$((SPCD_STEP_${SPCD_STEP_LEVEL}_INDEX + 1))"
for spcd_wpm__root in \ for spcd_wpm__root in \
"${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do "${SPCD_PYTHON_PACKAGES}" "${SPCD_PYTHON_VENV_PACKAGES}"; do
spcd_os_write "${spcd_wpm__root}/env.py" "${spcd_wpm__text} spcd_os_write "${spcd_wpm__root}/env.py" "${spcd_wpm__text}
SPCD_STEP = ${spcd_wpm__index} SPCD_STEP = $((SPCD_STEP + 1))
" "
done done
} }
@ -1266,11 +1265,9 @@ spcd_main() {
spcd_packages_install_tools spcd_packages_install_tools
spcd_step_out spcd_step_out
# ca # ca
spcd_step_in "CA" spcd_install_ca_certificates
spcd_ca_install_package spcd_write_ca_certificates
spcd_ca_write_certificates spcd_update_ca_certificates
spcd_ca_update_certificates
spcd_step_out
# packages # packages
spcd_step_in "Packages" spcd_step_in "Packages"
spcd_packages_verify_https spcd_packages_verify_https