diff --git a/readme.md b/readme.md index d6dd50f..f1a42ee 100644 --- a/readme.md +++ b/readme.md @@ -127,9 +127,9 @@ Handle project workflows in a unified way: | 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_MAIN | Main Git repository | spcd | +| SPCD_GIT_ROOT | Root Git repository | rwx | | SPCD_GIT_SHUNIT | ShUnit Git repository | shunit2 | -| SPCD_GIT_SPCD | SPCD Git repository | spcd | | SPCD_REF_FEATURE | Feature deployment ref | f | | SPCD_REF_RELEASE | Release deployment ref | main | | SPCD_REF_STAGING | Staging deployment ref | dev | diff --git a/spcd/bootstrap.sh b/spcd/bootstrap.sh index 7a61137..ca516b2 100644 --- a/spcd/bootstrap.sh +++ b/spcd/bootstrap.sh @@ -610,8 +610,8 @@ spcd_step__environment_defaults() { [ -n "${SPCD_DNS_1}" ] || SPCD_DNS_1="9.9.9.9" - [ -n "${SPCD_GIT_RWX}" ] || SPCD_GIT_RWX="rwx" - [ -n "${SPCD_GIT_SPCD}" ] || SPCD_GIT_SPCD="spcd" + [ -n "${SPCD_GIT_MAIN}" ] || SPCD_GIT_MAIN="spcd" + [ -n "${SPCD_GIT_ROOT}" ] || SPCD_GIT_ROOT="rwx" [ -n "${SPCD_GIT_SHUNIT}" ] || SPCD_GIT_SHUNIT="shunit2" @@ -1127,7 +1127,7 @@ spcd_step__python_modules() { spcd_step "List" spcd_os_ls "${spcd_ipm__target}" spcd_step "Main" - spcd_ipm__path="$(spcd_python_pip "${SPCD_GIT_SPCD}")" + spcd_ipm__path="$(spcd_python_pip "${SPCD_GIT_MAIN}")" # check matching of file and variable spcd_step "Check" spcd_ipm__script="${spcd_ipm__path}/bootstrap.sh" @@ -1140,7 +1140,7 @@ spcd_step__python_modules() { ls -l "${spcd_ipm__script}" "${SPCD_CMD_SUM}" -c "${spcd_ipm__check}" || spcd_error_ci "SPCD" spcd_step "Root" - spcd_python_pip "${SPCD_GIT_RWX}" + spcd_python_pip "${SPCD_GIT_ROOT}" spcd_step "List" spcd_os_ls "${spcd_ipm__target}" spcd_step_out @@ -1248,7 +1248,7 @@ SPCD_STEP = ${spcd_wpm__index} spcd_step__python_switch() { spcd_step "Switch" - spcd_stp__name="$(basename "${SPCD_GIT_SPCD}")" + spcd_stp__name="$(basename "${SPCD_GIT_MAIN}")" spcd_stp__path="$(realpath "${0}")" echo "\ ${spcd_stp__path}