From 70fd9fd9f000b902bbb1d59dfd2e4c4f9ca217b3 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@keepassxc.org>
Date: Tue, 11 Mar 2025 18:30:45 +0100
Subject: [PATCH] Check for git and merge basic and tool checks

---
 release-tool.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/release-tool.py b/release-tool.py
index 4361776f3..6309dbfc6 100755
--- a/release-tool.py
+++ b/release-tool.py
@@ -289,30 +289,27 @@ class Check(Command):
         parser.add_argument('-v', '--version', help='Release version number or name.')
         parser.add_argument('-s', '--src-dir', help='Source directory.', default='.')
         parser.add_argument('-b', '--release-branch', help='Release source branch (default: inferred from --version).')
-        parser.add_argument('-t', '--check-tools', help='Check for necessary build tools.', action='store_true')
 
-    def run(self, version, src_dir, release_branch, check_tools):
+    def run(self, version, src_dir, release_branch):
         if not version:
             logger.warning('No version specified, performing only basic checks.')
-        if check_tools:
-            self.perform_tool_checks()
         self.perform_basic_checks(src_dir)
         if version:
             self.perform_version_checks(version, src_dir, release_branch)
         logger.info('All checks passed.')
 
-    @classmethod
-    def perform_tool_checks(cls):
-        logger.info('Checking for required build tools...')
-        cls.check_xcode_setup()
-        cls.check_gnupg()
-
     @classmethod
     def perform_basic_checks(cls, src_dir):
         logger.info('Performing basic checks...')
         cls.check_src_dir_exists(src_dir)
+        cls.check_git()
         cls.check_git_repository(src_dir)
 
+        logger.info('Checking for required build tools...')
+        cls.check_git()
+        cls.check_gnupg()
+        cls.check_xcode_setup()
+
     @classmethod
     def perform_version_checks(cls, version, src_dir, git_ref=None, version_exists=False, checkout=True):
         logger.info('Performing version checks...')
@@ -403,17 +400,22 @@ class Check(Command):
             raise Error(f'{appstream} has not been updated to the "%s" release.', version)
 
     @staticmethod
-    def check_xcode_setup():
-        if sys.platform != 'darwin':
-            return
-        if not _cmd_exists('xcrun'):
-            raise Error('xcrun command not found! Please check that you have correctly installed Xcode.')
+    def check_git():
+        if not _cmd_exists('git'):
+            raise Error('Git not installed.')
 
     @staticmethod
     def check_gnupg():
         if not _cmd_exists('gpg'):
             raise Error('GnuPG not installed.')
 
+    @staticmethod
+    def check_xcode_setup():
+        if sys.platform != 'darwin':
+            return
+        if not _cmd_exists('xcrun'):
+            raise Error('xcrun command not found! Please check that you have correctly installed Xcode.')
+
 
 class Merge(Command):
     """Merge release branch into main branch and create release tags."""