* release.pl: verify upfront that non-rc splash is available on .1 point

release and ltr splash on .4 point release of ltr branches * scripts/update_ts.sh: keep original branch name
qgis · Mar 31, 2023 · d5cb7c9 · d5cb7c9
1 parent e2aad87
commit d5cb7c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/scripts/release.pl b/scripts/release.pl
@@ -136,7 +136,13 @@ ($$)
 
 my $splashwidth;
 unless( defined $dopoint ) {
-	pod2usage("Splash images/splash/splash-$newmajor.$newminor.png not found") unless -r "images/splash/splash-$newmajor.$newminor.png";
+	pod2usage("Splash images/splash/splash-${newmajor}.${newminor}rc.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}rc.png";
+} elsif($newpatch == 1) {
+	pod2usage("Splash images/splash/splash-${newmajor}.${newminor}.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}.png";
+} elsif($newpatch == 4) {	# TODO handle EPRs
+	if( system("git tag -l | grep -q '^ltr-${newmajor}_${newminor}$'") == 0) {
+		pod2usage("Splash images/splash/splash-${newmajor}.${newminor}ltr.png not found") unless -r "images/splash/splash-${newmajor}.${newminor}ltr.png";
+	}
 }
 
 print "Last pull rebase...\n";

diff --git a/scripts/update_ts.sh b/scripts/update_ts.sh
@@ -112,7 +112,7 @@ trap cleanup EXIT
 
 branch=$(git name-rev --name-only HEAD)
 if [[ "$branch" =~ ^release-[0-9]+_[0-9]+$ ]]; then
-	TX_FLAGS="--branch '${branch//_/-}'"
+	TX_FLAGS="--branch '${branch}'"
 fi
 
 echo Saving translations