diff --git a/cd.sh b/cd.sh index ebd6604..adf2c93 100644 --- a/cd.sh +++ b/cd.sh @@ -57,18 +57,18 @@ else echo 'CD_PROJECTS_GROUP' exit 3 fi -# -[ "${CI_SERVER_URL}" ] && CD_REPOSITORIES_URL="${CI_SERVER_URL}" -[ "${GITHUB_SERVER_URL}" ] && CD_REPOSITORIES_URL="${GITHUB_SERVER_URL}" -if [ "${CD_REPOSITORIES_URL}" ] ; then - CD_REPOSITORIES_URL+="/${CD_PROJECTS_GROUP}" - echo "CD_REPOSITORIES_URL = ${CD_REPOSITORIES_URL}" +# projects / url +[ "${CI_SERVER_URL}" ] && CD_PROJECTS_URL="${CI_SERVER_URL}" +[ "${GITHUB_SERVER_URL}" ] && CD_PROJECTS_URL="${GITHUB_SERVER_URL}" +if [ "${CD_PROJECTS_URL}" ] ; then + CD_PROJECTS_URL+="/${CD_PROJECTS_GROUP}" + echo "CD_PROJECTS_URL = ${CD_PROJECTS_URL}" else - echo 'CD_REPOSITORIES_URL' + echo 'CD_PROJECTS_URL' exit 3 fi # project / url -CD_PROJECT_URL="${CD_REPOSITORIES_URL}/${CD_PROJECT_NAME}" +CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}" function cd_step { if [ "${1}" ] ; then @@ -227,7 +227,7 @@ local root "${CD_NAME}" \ ; do git clone \ - "${CD_REPOSITORIES_URL}/${repository}" "${root}/${repository}" \ + "${CD_PROJECTS_URL}/${repository}" "${root}/${repository}" \ || exit cp --recursive \ "${root}/${repository}/${repository}" "${CD_PYTHON_PACKAGES}" \