process override flags before regular flags

iamcal · iamcal · commit 3d12a253c471 · 2024-02-06T11:18:24.000-08:00
diff --git a/build/google/map.php b/build/google/map.php
@@ -100,6 +100,7 @@ function try_fetch($row){
 
 			$inx = 'emoji_u'.$root.'.png';
 			if (file_exists("$src/$inx")){
+
 				copy("$src/$inx", "$dst/$out");
 				echo '.';
 				return;
@@ -108,26 +109,31 @@ function try_fetch($row){
 
 
 		#
-		# flags come from elsewhere...
+		# manually mapped flags next...
 		#
 
-		if (preg_match('!flag-(..)!', $row['short_name'], $m)){
-
-			$cc = StrToUpper($m[1]);
+		if (isset($flag_map[$row['short_name']])){
+			$cc = $flag_map[$row['short_name']];
 
 			if (file_exists("{$src_flags}/{$cc}.png")){
 				copy("{$src_flags}/{$cc}.png", "$dst/$out");
-				echo ',';
+				echo ':';
 				return;
 			}
 		}
 
-		if (isset($flag_map[$row['short_name']])){
-			$cc = $flag_map[$row['short_name']];
+
+		#
+		# flags based just on cc
+		#
+
+		if (preg_match('!flag-(..)!', $row['short_name'], $m)){
+
+			$cc = StrToUpper($m[1]);
 
 			if (file_exists("{$src_flags}/{$cc}.png")){
 				copy("{$src_flags}/{$cc}.png", "$dst/$out");
-				echo ':';
+				echo ',';
 				return;
 			}
 		}
