632628f9f28b14ca87d07d4baff47822579a5eb1
angie
  Wed Jul 28 15:40:58 2021 -0700
Clean up stripping of trailing \r\n - code review, thx Jonathan.

diff --git src/hg/utils/otto/sarscov2phylo/gisaidNameToCountry.pl src/hg/utils/otto/sarscov2phylo/gisaidNameToCountry.pl
index 4573f12..a5c6cb2 100755
--- src/hg/utils/otto/sarscov2phylo/gisaidNameToCountry.pl
+++ src/hg/utils/otto/sarscov2phylo/gisaidNameToCountry.pl
@@ -53,30 +53,29 @@
               'Shenzhen' => 'China',
               'Shulan' => 'China',
               'Sichuan' => 'China',
               'Tianmen' => 'China',
               'Urumqi' => 'China',
               'Weifang' => 'China',
               'Wuhan' => 'China',
               'Xinyu' => 'China',
               'Yichun' => 'China',
               'Yingtan' => 'China',
               'Yunnan' => 'China',
               'Zhejiang' => 'China',
             );
 
 while (<>) {
-  chomp; chomp;
-  $_ =~ s/\r$//;
+  s/[\r\n]+$//;
   my $wholeName = $_;
   $wholeName =~ s/[ ',()]//g;
   if (/^([a-z ]+\/|North America\/)?([A-Z][a-zA-Z '_-]+)\//) {
     my $country = $2;
     if (exists $fixup{$country}) {
       $country = $fixup{$country};
     }
     print "$wholeName\t$country\n";
   } else {
     print "$wholeName\t?\n";
   }
 }