Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 00:09:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix powershell merge with no changes to translations

Browse Source
This commit is contained in:
Jonathan White 2022-10-23 09:19:36 -04:00
parent 3efad4e14b
commit 4030dbc4b4
No known key found for this signature in database
GPG Key ID: 440FC65F2E0C6E01
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
release-tool.ps1
View File

@ -290,8 +290,8 @@ if ($Merge) {
Invoke-Cmd "tx" "pull -af --minimum-perc=60 --parallel -r keepassxc.share-translations-keepassxc-en-ts--develop" Invoke-Cmd "tx" "pull -af --minimum-perc=60 --parallel -r keepassxc.share-translations-keepassxc-en-ts--develop"
# Only commit if there are changes # Only commit if there are changes
& git diff-index --quiet HEAD -- $changes = & git status --porcelain
if ($LASTEXITCODE) { if ($changes.Length > 0) {
Write-Host "Committing translation updates..." Write-Host "Committing translation updates..."
Invoke-Cmd "git" "add -A ./share/translations/" -quiet Invoke-Cmd "git" "add -A ./share/translations/" -quiet
Invoke-Cmd "git" "commit -m `"Update translations`"" -quiet Invoke-Cmd "git" "commit -m `"Update translations`"" -quiet
@ -429,8 +429,8 @@ if ($Merge) {
# SIG # Begin signature block # SIG # Begin signature block
# MIIkvgYJKoZIhvcNAQcCoIIkrzCCJKsCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB # MIIkvgYJKoZIhvcNAQcCoIIkrzCCJKsCAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQU7XPI0rkE0K+tjo2rCMeHtdZz # AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUccSicCrmJ6HTiKZr9ZV5mT6i
# Homggh6mMIIFOjCCBCKgAwIBAgIQWKLXLYzA/YnM/yHg1O3HSjANBgkqhkiG9w0B # 9sqggh6mMIIFOjCCBCKgAwIBAgIQWKLXLYzA/YnM/yHg1O3HSjANBgkqhkiG9w0B
# AQsFADB8MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVy # AQsFADB8MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVy
# MRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxJDAi # MRAwDgYDVQQHEwdTYWxmb3JkMRgwFgYDVQQKEw9TZWN0aWdvIExpbWl0ZWQxJDAi
# BgNVBAMTG1NlY3RpZ28gUlNBIENvZGUgU2lnbmluZyBDQTAeFw0yMTAzMTUwMDAw # BgNVBAMTG1NlY3RpZ28gUlNBIENvZGUgU2lnbmluZyBDQTAeFw0yMTAzMTUwMDAw
@ -599,29 +599,29 @@ if ($Merge) {
# dGlnbyBSU0EgQ29kZSBTaWduaW5nIENBAhBYotctjMD9icz/IeDU7cdKMAkGBSsO # dGlnbyBSU0EgQ29kZSBTaWduaW5nIENBAhBYotctjMD9icz/IeDU7cdKMAkGBSsO
# AwIaBQCgeDAYBgorBgEEAYI3AgEMMQowCKACgAChAoAAMBkGCSqGSIb3DQEJAzEM # AwIaBQCgeDAYBgorBgEEAYI3AgEMMQowCKACgAChAoAAMBkGCSqGSIb3DQEJAzEM
# BgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqG # BgorBgEEAYI3AgEEMBwGCisGAQQBgjcCAQsxDjAMBgorBgEEAYI3AgEVMCMGCSqG
# SIb3DQEJBDEWBBRYLpuPBROfMTynBtjm5j06n4Z91DANBgkqhkiG9w0BAQEFAASC # SIb3DQEJBDEWBBQyqMslxaPRHhE8POQX8uLV4mnwLjANBgkqhkiG9w0BAQEFAASC
# AQAgZ0KIO8RywhzEkgXuS+uAWqgML0MHMRWLngS57O5mZieVaIINPse10n5wZCKo # AQBhQUgt7fRTbF1rGUv7z9sdfZzNQiLWg2LYMURLZAWcZRFBW6RoP6rTSbpquyRZ
# Ny04xB2ATqHld0vvSnlDfZWY+a/aR5b3Cw2Gn4+R9suA/GtqM/nKEcOLqG76B8Cp # Bs4BlK7JkxCHBXrCeYl5qMx7b6N7twsgyz8OR+EPnYIkEoaKafeqO6B/Q0NhhdOW
# Ij/mgVJSomhsxjOJGHgPIghdQNNldxFQgpgD4GOvWZsLUQTje6SXZEDbveISr1Zs # vd0wK2YsD5Sb7135a0trAQtS+fnhRr9y9LgMHePBq3iJAo8BWtcUYF5eBbLmJjZU
# 4/X6m/y/YO/JXcHZA3iZc+716I62WpyPUrNA32sadaILDqKQnF831FBprtQv+XGe # yzu6aUlXgVakBm8fso0NqLNAVn0vQizJHqsnK610+zCVlzPQ/2HflRpwLgF4X1kQ
# dXw4r3KUcw0qOvvr4OvEBD5VKHpzSJfE9uwuKLChfUJnZoPE62K1FlDas8eCs2TG # Jewj42T2kjzn1Worzcsj3v7WJgbuqThnVR1NIhi+bhfpkrCr4iC/+4QIZZLkzUHl
# zaZMBChgiLtBnokF5XMloXQroYIDTDCCA0gGCSqGSIb3DQEJBjGCAzkwggM1AgEB # cS3DhzvxAQ62whQsUAB9z2HBoYIDTDCCA0gGCSqGSIb3DQEJBjGCAzkwggM1AgEB
# MIGSMH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIx # MIGSMH0xCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIx
# EDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDElMCMG # EDAOBgNVBAcTB1NhbGZvcmQxGDAWBgNVBAoTD1NlY3RpZ28gTGltaXRlZDElMCMG
# A1UEAxMcU2VjdGlnbyBSU0EgVGltZSBTdGFtcGluZyBDQQIRAJA5f5rSSjoT8r2R # A1UEAxMcU2VjdGlnbyBSU0EgVGltZSBTdGFtcGluZyBDQQIRAJA5f5rSSjoT8r2R
# Xwg4qUMwDQYJYIZIAWUDBAICBQCgeTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB # Xwg4qUMwDQYJYIZIAWUDBAICBQCgeTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcB
# MBwGCSqGSIb3DQEJBTEPFw0yMjEwMjMxMjE5MzVaMD8GCSqGSIb3DQEJBDEyBDDb # MBwGCSqGSIb3DQEJBTEPFw0yMjEwMjMxMzE4MTZaMD8GCSqGSIb3DQEJBDEyBDAi
# fV6yn2jtMhGJi4Y/TkV7oK4/st2Zlmhr7saH2G5o9f9RqnnEydRyC7WYCgF7T5Aw # pcegfL2b7n0V2o/qV4vNL3exKvlIIxuSCCqMkqibj2h04kPtwOkjhJ064uMHSwcw
# DQYJKoZIhvcNAQEBBQAEggIAdZmUZFmO9/4v/5hpmRpg0yMXWF/TQ/GnOep70/5I # DQYJKoZIhvcNAQEBBQAEggIAWMkT++gXvrUNBmS62Sw9TekX6fEKJIOFwLHO5wzh
# oiLusWaWaXzY4yZCXF0HTtermsZLEVaEveqP8H4+a9ArLsTer/C5iftXclar9OGe # AdBv/NavsMLB+PNrKizKLL02+Q9v+kyKaeFFlReWa50S+meM2L+wW5YRMGggBKRB
# zU04aGaEVEBmRD2SeiAEjySLbaW/J98VoN7W645m0jV+ZPOMT4qeiAk3PjgSTR4r # Xhos4qL0ZffKPDbrjmCW0+HdRj408yyNCNB5aPSS6ZLjPpSa6mqVyySfnSdZnyaC
# yWhLDtPREDX5iLS+blDdiNpGV+vlRGGwmz4SWJulgrb30laISGkuo/x7/jDZcYVi # zXYQ2Y4qD3JGSk1MbRvCYB+jCaMM4unyJAS4IA6nWQ97184KLm5U2ktn9ygeWLlG
# 0BEWE7U/s7U5+2Zk2WCCkK4nfg18rr2bOS9LNZX4aNUKxzwJvo77nk0e14pyRS+x # ujQ2plQ7HuHD+/rMSqesQT6OcwGtERYyfDs+hndpONjKBIulbJJDM1mN6uLQpkfZ
# YwNqksPrhixaF4CsE2PFBCrWmqtXfGzvI2BUJfOoHcOAmsE9zGeDlMAjRgzPEBDf # f/TPTZQBDx6EA1oUZ3Evx4cReQFZJjnVlsAJBnKmu3mHheisdlxuFv1DZfu2OD/M
# UIZO8Tvqm3IlmKiDMHAJH5Fs4K4BjqhhfGmhRBsv5QF44Gwx9Ov29JtHsguIiVmu # nqY2DeCCgmeC212fosI8ZHUupaKRXVjfcVNElt34lK+3FMzYSKr6rCxiFEXbjq8u
# ux4RHmzwDJIwCQvHOR2FXeJgdoWxjRwTsOs9J2hrLAGg0qy/LYFDZ2SAzC77KCXW # WTG45ZMmcLzs7l9Yaz0eTc642SyBa+5OoTTXs3t9G5z9lVbGonOhfGVbJM+l8JNc
# 77GDEWRhvtkKuyHcukAdYx/BOPHIT+8VUeOzcqo2EnPy5yfHET5qgBibndXU8mZo # txM+CnQt/OOcjTMDKcjOwG9gcxHjYQhpK8PKiXmPmgpaGYn5vCL5fLvR+s+vTsm4
# HzjLA4pucdFFxoB+89Y9g9GZc4cLof7vp+dj9yJSE0fkIuBsgqt/wTBO+QolODA2 # DJjUTHY87VVXt2IwOu45n1+RBJynewLeaXkwo+79R+/Dn/xoqVVGLRRU6c3yCIiW
# coUBorDGVZNk5iEe1dTQ6n+PhWWVwlUxIcwDOpyqE1s1Yl1Jlu14xsFGEsR/Y2As # qKmsdlIziAr/Fou7jzKcaPFhVJ/NMsI/2c8bkfi6Baoh+go3j39nA3/oDtb4vHWk
# O+A= # Y2E=
# SIG # End signature block # SIG # End signature block