From 724f28d17fb670d04fb20a72cf79de54be0d57ea Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Mon, 29 Apr 2024 12:15:49 +0200
Subject: [PATCH] order

---
 cd.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cd.sh b/cd.sh
index 06ab309..01aab9c 100644
--- a/cd.sh
+++ b/cd.sh
@@ -46,24 +46,24 @@ cd_set_environment () {
     # ci / github
     if [ "${GITHUB_ACTIONS}" ] ; then
         CD_SERVER_URL="${GITHUB_SERVER_URL}"
-        CD_PROJECT_BRANCH="${GITHUB_REF_NAME}"
-        CD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")"
         CD_PROJECTS_GROUP="$(dirname "${GITHUB_REPOSITORY}")"
+        CD_PROJECT_NAME="$(basename "${GITHUB_REPOSITORY}")"
+        CD_PROJECT_BRANCH="${GITHUB_REF_NAME}"
     # ci / gitlab
     elif [ "${GITLAB_CI}" ] ; then
         CD_SERVER_URL="${CI_SERVER_URL}"
-        CD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}"
-        CD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")"
         CD_PROJECTS_GROUP="$(dirname "${CI_PROJECT_PATH}")"
+        CD_PROJECT_NAME="$(basename "${CI_PROJECT_PATH}")"
+        CD_PROJECT_BRANCH="${CI_COMMIT_BRANCH}"
     # ci / none
     else
         cd_error_ci "ø"
     fi
     #
     [ "${CD_SERVER_URL}" ] || cd_error_ci "CD_SERVER_URL"
-    [ "${CD_PROJECT_BRANCH}" ] || cd_error_ci "CD_PROJECT_BRANCH"
-    [ "${CD_PROJECT_NAME}" ] || cd_error_ci "CD_PROJECT_NAME"
     [ "${CD_PROJECTS_GROUP}" ] || cd_error_ci "CD_PROJECTS_GROUP"
+    [ "${CD_PROJECT_NAME}" ] || cd_error_ci "CD_PROJECT_NAME"
+    [ "${CD_PROJECT_BRANCH}" ] || cd_error_ci "CD_PROJECT_BRANCH"
     #
     CD_PROJECTS_URL="${CD_SERVER_URL}/${CD_PROJECTS_GROUP}"
     CD_PROJECT_URL="${CD_PROJECTS_URL}/${CD_PROJECT_NAME}"
@@ -78,9 +78,9 @@ CD_PYTHON_COMMAND=${CD_PYTHON_COMMAND}
 CD_PYTHON_PACKAGES=${CD_PYTHON_PACKAGES}
 #
 CD_SERVER_URL=${CD_SERVER_URL}
-CD_PROJECT_BRANCH=${CD_PROJECT_BRANCH}
-CD_PROJECT_NAME=${CD_PROJECT_NAME}
 CD_PROJECTS_GROUP=${CD_PROJECTS_GROUP}
+CD_PROJECT_NAME=${CD_PROJECT_NAME}
+CD_PROJECT_BRANCH=${CD_PROJECT_BRANCH}
 #
 CD_PROJECTS_URL=${CD_PROJECTS_URL}
 CD_PROJECT_URL=${CD_PROJECT_URL}