Update check and i18n

* Incorporate shell=True directly into _run when on windows and modifying path/env
* Fix _get_bin_path to resolve the build_dir to absolute path
* Fix _git_branches_related to ignore non-zero return code
* Fix double naming of transifex resource

Author: droidmonkey

.tx/config

@@ -4,16 +4,18 @@ host = https://app.transifex.com
 [o:keepassxc:p:keepassxc:r:share-translations-keepassxc-en-ts--develop]
 file_filter            = share/translations/keepassxc_<lang>.ts
 source_file            = share/translations/keepassxc_en.ts
-source_lang            = en
 type                   = QT
+minimum_perc           = 60
+resource_name          = keepassxc_en.ts (develop)
 replace_edited_strings = false
 keep_translations      = false
 
 [o:keepassxc:p:keepassxc:r:share-translations-keepassxc-en-ts--master]
 file_filter            = share/translations/keepassxc_<lang>.ts
 source_file            = share/translations/keepassxc_en.ts
-source_lang            = en
 type                   = QT
+minimum_perc           = 60
+resource_name          = keepassxc_en.ts (2.7.x stable)
 replace_edited_strings = false
 keep_translations      = false
 

release-tool.py

@@ -111,7 +111,7 @@ def format(self, record):
 def _get_bin_path(build_dir=None):
     if not build_dir:
         return os.getenv('PATH')
-    build_dir = Path(build_dir)
+    build_dir = Path(build_dir).absolute()
     path_sep = ';' if sys.platform == 'win32' else ':'
     return path_sep.join(list(map(str, build_dir.rglob('vcpkg_installed/*/tools/**/bin'))) + [os.getenv('PATH')])
 
@@ -152,6 +152,10 @@ def _run(cmd, *args, cwd, path=None, env=None, input=None, capture_output=True,
         env['PATH'] = path
     if _term_colors_on():
         env['FORCE_COLOR'] = '1'
+    
+    # Windows needs shell=True if env or path is modified
+    if sys.platform == 'win32' and (env or path):
+        run_kwargs['shell'] = True
 
     if docker_image:
         docker_cmd = ['docker', 'run', '--rm', '--tty=true', f'--workdir={cwd}', f'--user={os.getuid()}:{os.getgid()}']
@@ -209,8 +213,8 @@ def _git_get_branch(*, cwd):
 
 def _git_branches_related(branch1, branch2, *, cwd):
     """Check whether branch is ancestor or descendant of another."""
-    return (_run(['git', 'merge-base', '--is-ancestor', branch1, branch2], cwd=cwd).returncode == 0 or
-            _run(['git', 'merge-base', '--is-ancestor', branch2, branch1], cwd=cwd).returncode == 0)
+    return (_run(['git', 'merge-base', '--is-ancestor', branch1, branch2], cwd=cwd, check=False).returncode == 0 or
+            _run(['git', 'merge-base', '--is-ancestor', branch2, branch1], cwd=cwd, check=False).returncode == 0)
 
 
 _GIT_ORIG_BRANCH_CWD = None
@@ -443,10 +447,12 @@ def check_app_stream_info(version, cwd):
             appstream = Path(cwd) / appstream
         if not appstream.is_file():
             raise Error('File not found: %s', appstream)
-        major, minor, patch = _split_version(version)
-        if not re.search(rf'^\s*<release version="{major}\.{minor}\.{patch}" date=".+?">',
-                         appstream.read_text(), re.MULTILINE):
-            raise Error(f'{appstream} has not been updated to the "%s" release.', version)
+        regex = re.compile(rf'^\s*<release version="{version}" date=".+?">')
+        with appstream.open('r', encoding='utf-8') as f:
+            for line in f:
+                if regex.search(line):
+                    return
+        raise Error(f'{appstream} has not been updated to the "%s" release.', version)
 
     @staticmethod
     def check_git():
@@ -682,15 +688,14 @@ def build_windows(self, version, src_dir, output_dir, *, parallelism, cmake_opts
 
         # Start the build
         with tempfile.TemporaryDirectory() as build_dir:
-            # NOTE: Shell must be True on Windows to run the command in the provided vs_env
             logger.info('Configuring build...')
-            _run(['cmake', *cmake_opts, str(src_dir)], cwd=build_dir, env=vs_env, shell=True, capture_output=False)
+            _run(['cmake', *cmake_opts, str(src_dir)], cwd=build_dir, env=vs_env, capture_output=False)
 
             logger.info('Compiling sources...')
-            _run(['cmake', '--build', '.', f'--parallel', str(parallelism)], cwd=build_dir, env=vs_env, shell=True, capture_output=False)
+            _run(['cmake', '--build', '.', f'--parallel', str(parallelism)], cwd=build_dir, env=vs_env, capture_output=False)
 
             logger.info('Packaging application...')
-            _run(['cpack', '-G', 'ZIP;WIX'], cwd=build_dir, env=vs_env, shell=True, capture_output=False)
+            _run(['cpack', '-G', 'ZIP;WIX'], cwd=build_dir, env=vs_env, capture_output=False)
 
             output_files = list(Path(build_dir).glob("*.zip")) + list(Path(build_dir).glob("*.msi"))
             for output_file in output_files:
@@ -1092,7 +1097,6 @@ def run(self, subcmd, src_dir, branch, **kwargs):
             self.check_transifex_config_exists(src_dir)
 
             kwargs['resource'] = self.derive_resource_name(kwargs['resource'], cwd=src_dir)
-            kwargs['resource'] = self.TRANSIFEX_RESOURCE.format(kwargs['resource'])
             kwargs['tx_args'] = kwargs['tx_args'][1:]
             if subcmd == 'tx-push':
                 self.run_tx_push(src_dir, **kwargs)