diff --git a/cd.sh b/cd.sh index fd5bdc6..97bae6b 100644 --- a/cd.sh +++ b/cd.sh @@ -28,16 +28,6 @@ case "${CD_OS_NAME}" in ;; esac # -[ "${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_REPOSITORIES_GROUP}" - echo "CD_REPOSITORIES_URL = ${CD_REPOSITORIES_URL}" -else - echo 'CD_REPOSITORIES_URL' - exit 3 -fi -# [ "${CI_PROJECT_NAME}" ] && CD_PROJECT_NAME="${CI_PROJECT_NAME}" [ "${GITHUB_REPOSITORY}" ] \ && CD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")" @@ -49,6 +39,16 @@ else 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_REPOSITORIES_GROUP}" + echo "CD_REPOSITORIES_URL = ${CD_REPOSITORIES_URL}" +else + echo 'CD_REPOSITORIES_URL' + exit 3 +fi +# [ "${CI_COMMIT_BRANCH}" ] && CD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}" [ "${GITHUB_REF_NAME}" ] && CD_PROJECT_BRANCH="${GITHUB_REF_NAME}" if [ "${CD_PROJECT_BRANCH}" ] ; then