From 1ea749f4932911e7caa6d7761ab2858d01fb89c6 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Mon, 10 Jan 2022 12:10:45 +0100
Subject: [PATCH] Update references for branch `master` to refer to `main`

---
 .github/workflows/weblate-update.yml | 2 +-
 bin/autoresolve                      | 6 +++---
 bin/update                           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/weblate-update.yml b/.github/workflows/weblate-update.yml
index cd1e1aae..4585791b 100644
--- a/.github/workflows/weblate-update.yml
+++ b/.github/workflows/weblate-update.yml
@@ -3,7 +3,7 @@ name: Weblate Update
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   trigger-update:
diff --git a/bin/autoresolve b/bin/autoresolve
index e1d2d916..5decaa77 100755
--- a/bin/autoresolve
+++ b/bin/autoresolve
@@ -175,8 +175,8 @@ if [ "$manage_remote" == true ]; then
   git checkout -b pull/$PR_NUMBER $PR_AUTHOR/$PR_BRANCH
 fi
 
-# Attempt to merge master, should fail
-git merge --no-ff --no-commit origin/master || true
+# Attempt to merge main, should fail
+git merge --no-ff --no-commit origin/main || true
 
 if [ ! -f .git/MERGE_HEAD ]; then
   echo "Merge aborted or succeeded for some unknown reason. Cancelling pull request resolution"
@@ -207,7 +207,7 @@ while IFS= read -r line; do
 done <<< "$GIT_STATUS"
 
 # Finish the merge
-echo -e "Update with base 'origin/master'\n\nResolves source catalog conflicts" > .git/MERGE_MSG
+echo -e "Update with base 'origin/main'\n\nResolves source catalog conflicts" > .git/MERGE_MSG
 GIT_EDITOR=true git merge --continue
 
 if [ "$manage_remote" == true ]; then
diff --git a/bin/update b/bin/update
index 60bd58b1..30dd4f52 100755
--- a/bin/update
+++ b/bin/update
@@ -38,8 +38,8 @@ FETCHED_REPOS=();
 for repo_name in "${SOURCE_REPOSITORIES[@]}"; do
   if [ ! -d "sources.d/$repo_name" ]; then
     FETCHED_REPOS+=( $repo_name );
-    wget -q -O - https://github.com/Icinga/$repo_name/archive/master.tar.gz | tar xz
-    mv $repo_name-master/ sources.d/$repo_name
+    wget -q -O - https://github.com/Icinga/$repo_name/archive/main.tar.gz | tar xz
+    mv $repo_name-main/ sources.d/$repo_name
   fi
 done