From 63863f69c05b978720df2d2f09e2bafdf9d314e2 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 13 Mar 2022 18:40:55 +0100
Subject: [PATCH] ci check branch

---
 bundles/build-server/files/ci | 4 +++-
 bundles/lonercrew/metadata.py | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/bundles/build-server/files/ci b/bundles/build-server/files/ci
index 7c90e44..06f43eb 100644
--- a/bundles/build-server/files/ci
+++ b/bundles/build-server/files/ci
@@ -7,11 +7,13 @@ CONFIG_PATH=${config_path}
 JSON="$1"
 REPO_NAME=$(jq -r .repository.name <<< $JSON)
 CLONE_URL=$(jq -r .repository.clone_url <<< $JSON)
+REPO_BRANCH=$(jq -r .ref <<< $JSON | cut -d'/' -f3)
 SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
 
 for INTEGRATION in "$(cat $CONFIG_PATH | jq -r '.ci | values[]')"
 do
-  [[ $(jq -r '.repo' <<< $INTEGRATION) = $REPO_NAME ]] || continue
+  [[ $(jq -r '.repo' <<< $INTEGRATION) = "$REPO_NAME" ]] || continue
+  [[ $(jq -r '.branch' <<< $INTEGRATION) = "$REPO_BRANCH" ]] || continue
   
   HOSTNAME=$(jq -r '.hostname' <<< $INTEGRATION)
   DEST_PATH=$(jq -r '.path' <<< $INTEGRATION)
diff --git a/bundles/lonercrew/metadata.py b/bundles/lonercrew/metadata.py
index 0bcdcaf..756d284 100644
--- a/bundles/lonercrew/metadata.py
+++ b/bundles/lonercrew/metadata.py
@@ -7,7 +7,7 @@ defaults = {
         'lonercrew': {
             'path': '/opt/lonercrew',
             'group': 'www-data',
-            'rev': 'master',
+            'branch': 'master',
         },
     },
 }