From 46d7b2af9a8dc5ea3166510d89fca586743b8622 Mon Sep 17 00:00:00 2001
From: Guillaume Vincent <guillaume@oslab.fr>
Date: Thu, 16 Dec 2021 23:06:19 +0100
Subject: [PATCH] Rename master branch to main in bin

---
 bin/build_web_extensions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/build_web_extensions b/bin/build_web_extensions
index 2c5f673..cb8fbf9 100755
--- a/bin/build_web_extensions
+++ b/bin/build_web_extensions
@@ -32,11 +32,11 @@ function check_repository_is_clean {
     fi
 }
 
-function check_branch_is_master {
-    BRANCH_NAME=$(git branch | grep \* | cut -d ' ' -f2)
-    if [ $BRANCH_NAME != "master" ]
+function check_branch_is_main {
+    BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+    if [ $BRANCH_NAME != "main" ]
     then
-        print_error "Current branch is not master. Aborting."
+        print_error "Current branch is not main. Aborting."
         exit 1
     fi
 }
@@ -54,7 +54,7 @@ set +o errexit
 
 bump_type="${1:-}"
 check_bump_type_is_defined ${bump_type}
-check_branch_is_master
+check_branch_is_main
 check_current_directory_is_root
 check_repository_is_clean
 
@@ -102,7 +102,7 @@ function commit {
     git commit --message="Auto build for lesspass-web-extension"
 }
 
-current_version=$( grep -Po '(?<="version": ")[^"]*' packages/lesspass-web-extension/package.json )
+current_version=$( grep -m1 version packages/lesspass-web-extension/package.json | cut -d '"' -f4 )
 echo "Current lesspass-web-extension version is ${current_version}"
 new_version=$( increment_version ${current_version} ${bump_type} )
 echo "New lesspass-web-extension version is ${new_version}"