From d98698265846c3d4114bce803be4ee30ca8c7309 Mon Sep 17 00:00:00 2001
From: Sam Erickson <samericksn@gmail.com>
Date: Fri, 5 Apr 2019 16:20:17 -0700
Subject: [PATCH] Fixed error with some countries not displaying properly

---
 .local/share/larbs/flag-emojis | 522 ++++++++++++++++-----------------
 .scripts/statusbar/locate      |   3 +-
 2 files changed, 262 insertions(+), 263 deletions(-)

diff --git a/.local/share/larbs/flag-emojis b/.local/share/larbs/flag-emojis
index eb982687..49c634e9 100644
--- a/.local/share/larbs/flag-emojis
+++ b/.local/share/larbs/flag-emojis
@@ -1,261 +1,261 @@
-🇦🇨AscensionIsland
-🇦🇩Andorra
-🇦🇪UnitedArabEmirates
-🇦🇫Afghanistan
-🇦🇬Antigua&Barbuda
-🇦🇮Anguilla
-🇦🇱Albania
-🇦🇲Armenia
-🇦🇴Angola
-🇦🇶Antarctica
-🇦🇷Argentina
-🇦🇸AmericanSamoa
-🇦🇹Austria
-🇦🇺Australia
-🇦🇼Aruba
-🇦🇽ÅlandIslands
-🇦🇿Azerbaijan
-🇧🇦Bosnia&Herzegovina
-🇧🇧Barbados
-🇧🇩Bangladesh
-🇧🇪Belgium
-🇧🇫BurkinaFaso
-🇧🇬Bulgaria
-🇧🇭Bahrain
-🇧🇮Burundi
-🇧🇯Benin
-🇧🇱St.Barthélemy
-🇧🇲Bermuda
-🇧🇳Brunei
-🇧🇴Bolivia
-🇧🇶CaribbeanNetherlands
-🇧🇷Brazil
-🇧🇸Bahamas
-🇧🇹Bhutan
-🇧🇻BouvetIsland
-🇧🇼Botswana
-🇧🇾Belarus
-🇧🇿Belize
-🇨🇦Canada
-🇨🇨Cocos(Keeling)Islands
-🇨🇩Congo-Kinshasa
-🇨🇫CentralAfricanRepublic
-🇨🇬Congo-Brazzaville
-🇨🇭Switzerland
-🇨🇮Côted’Ivoire
-🇨🇰CookIslands
-🇨🇱Chile
-🇨🇲Cameroon
-🇨🇳China
-🇨🇴Colombia
-🇨🇵ClippertonIsland
-🇨🇷CostaRica
-🇨🇺Cuba
-🇨🇻CapeVerde
-🇨🇼Curaçao
-🇨🇽ChristmasIsland
-🇨🇾Cyprus
-🇨🇿Czechia
-🇩🇪Germany
-🇩🇬DiegoGarcia
-🇩🇯Djibouti
-🇩🇰Denmark
-🇩🇲Dominica
-🇩🇴DominicanRepublic
-🇩🇿Algeria
-🇪🇦Ceuta&Melilla
-🇪🇨Ecuador
-🇪🇪Estonia
-🇪🇬Egypt
-🇪🇭WesternSahara
-🇪🇷Eritrea
-🇪🇸Spain
-🇪🇹Ethiopia
-🇪🇺EuropeanUnion
-🇫🇮Finland
-🇫🇯Fiji
-🇫🇰FalklandIslands
-🇫🇲Micronesia
-🇫🇴FaroeIslands
-🇫🇷France
-🇬🇦Gabon
-🇬🇧UnitedKingdom
-🇬🇩Grenada
-🇬🇪Georgia
-🇬🇫FrenchGuiana
-🇬🇬Guernsey
-🇬🇭Ghana
-🇬🇮Gibraltar
-🇬🇱Greenland
-🇬🇲Gambia
-🇬🇳Guinea
-🇬🇵Guadeloupe
-🇬🇶EquatorialGuinea
-🇬🇷Greece
-🇬🇸SouthGeorgia&SouthSandwichIslands
-🇬🇹Guatemala
-🇬🇺Guam
-🇬🇼Guinea-Bissau
-🇬🇾Guyana
-🇭🇰HongKongSARChina
-🇭🇲Heard&McDonaldIslands
-🇭🇳Honduras
-🇭🇷Croatia
-🇭🇹Haiti
-🇭🇺Hungary
-🇮🇨CanaryIslands
-🇮🇩Indonesia
-🇮🇪Ireland
-🇮🇱Israel
-🇮🇲IsleofMan
-🇮🇳India
-🇮🇴BritishIndianOceanTerritory
-🇮🇶Iraq
-🇮🇷Iran
-🇮🇸Iceland
-🇮🇹Italy
-🇯🇪Jersey
-🇯🇲Jamaica
-🇯🇴Jordan
-🇯🇵Japan
-🇰🇪Kenya
-🇰🇬Kyrgyzstan
-🇰🇭Cambodia
-🇰🇮Kiribati
-🇰🇲Comoros
-🇰🇳St.Kitts&Nevis
-🇰🇵NorthKorea
-🇰🇷SouthKorea
-🇰🇼Kuwait
-🇰🇾CaymanIslands
-🇰🇿Kazakhstan
-🇱🇦Laos
-🇱🇧Lebanon
-🇱🇨St.Lucia
-🇱🇮Liechtenstein
-🇱🇰SriLanka
-🇱🇷Liberia
-🇱🇸Lesotho
-🇱🇹Lithuania
-🇱🇺Luxembourg
-🇱🇻Latvia
-🇱🇾Libya
-🇲🇦Morocco
-🇲🇨Monaco
-🇲🇩Moldova
-🇲🇪Montenegro
-🇲🇫St.Martin
-🇲🇬Madagascar
-🇲🇭MarshallIslands
-🇲🇰NorthMacedonia
-🇲🇱Mali
-🇲🇲Myanmar(Burma)
-🇲🇳Mongolia
-🇲🇴MacauSarChina
-🇲🇵NorthernMarianaIslands
-🇲🇶Martinique
-🇲🇷Mauritania
-🇲🇸Montserrat
-🇲🇹Malta
-🇲🇺Mauritius
-🇲🇻Maldives
-🇲🇼Malawi
-🇲🇽Mexico
-🇲🇾Malaysia
-🇲🇿Mozambique
-🇳🇦Namibia
-🇳🇨NewCaledonia
-🇳🇪Niger
-🇳🇫NorfolkIsland
-🇳🇬Nigeria
-🇳🇮Nicaragua
-🇳🇱Netherlands
-🇳🇴Norway
-🇳🇵Nepal
-🇳🇷Nauru
-🇳🇺Niue
-🇳🇿NewZealand
-🇴🇲Oman
-🇵🇦Panama
-🇵🇪Peru
-🇵🇫FrenchPolynesia
-🇵🇬PapuaNewGuinea
-🇵🇭Philippines
-🇵🇰Pakistan
-🇵🇱Poland
-🇵🇲St.Pierre&Miquelon
-🇵🇳PitcairnIslands
-🇵🇷PuertoRico
-🇵🇸PalestinianTerritories
-🇵🇹Portugal
-🇵🇼Palau
-🇵🇾Paraguay
-🇶🇦Qatar
-🇷🇪Réunion
-🇷🇴Romania
-🇷🇸Serbia
-🇷🇺Russia
-🇷🇼Rwanda
-🇸🇦SaudiArabia
-🇸🇧SolomonIslands
-🇸🇨Seychelles
-🇸🇩Sudan
-🇸🇪Sweden
-🇸🇬Singapore
-🇸🇭St.Helena
-🇸🇮Slovenia
-🇸🇯Svalbard&JanMayen
-🇸🇰Slovakia
-🇸🇱SierraLeone
-🇸🇲SanMarino
-🇸🇳Senegal
-🇸🇴Somalia
-🇸🇷Suriname
-🇸🇸SouthSudan
-🇸🇹SãoTomé&Príncipe
-🇸🇻ElSalvador
-🇸🇽SintMaarten
-🇸🇾Syria
-🇸🇿Swaziland
-🇹🇦TristanDaCunha
-🇹🇨Turks&CaicosIslands
-🇹🇩Chad
-🇹🇫FrenchSouthernTerritories
-🇹🇬Togo
-🇹🇭Thailand
-🇹🇯Tajikistan
-🇹🇰Tokelau
-🇹🇱Timor-Leste
-🇹🇲Turkmenistan
-🇹🇳Tunisia
-🇹🇴Tonga
-🇹🇷Turkey
-🇹🇹Trinidad&Tobago
-🇹🇻Tuvalu
-🇹🇼Taiwan
-🇹🇿Tanzania
-🇺🇦Ukraine
-🇺🇬Uganda
-🇺🇲U.S.OutlyingIslands
-🇺🇳UnitedNations
-🇺🇸UnitedStates
-🇺🇾Uruguay
-🇺🇿Uzbekistan
-🇻🇦VaticanCity
-🇻🇨St.Vincent&Grenadines
-🇻🇪Venezuela
-🇻🇬BritishVirginIslands
-🇻🇮U.S.VirginIslands
-🇻🇳Vietnam
-🇻🇺Vanuatu
-🇼🇫Wallis&Futuna
-🇼🇸Samoa
-🇽🇰Kosovo
-🇾🇪Yemen
-🇾🇹Mayotte
-🇿🇦SouthAfrica
-🇿🇲Zambia
-🇿🇼Zimbabwe
-🏴󠁧󠁢󠁥󠁮󠁧󠁿England
-🏴󠁧󠁢󠁳󠁣󠁴󠁿Scotland
-🏴󠁧󠁢󠁷󠁬󠁳󠁿Wales
+🇦🇨 Ascension Island
+🇦🇩 Andorra
+🇦🇪 United Arab Emirates
+🇦🇫 Afghanistan
+🇦🇬 Antigua & Barbuda
+🇦🇮 Anguilla
+🇦🇱 Albania
+🇦🇲 Armenia
+🇦🇴 Angola
+🇦🇶 Antarctica
+🇦🇷 Argentina
+🇦🇸 American Samoa
+🇦🇹 Austria
+🇦🇺 Australia
+🇦🇼 Aruba
+🇦🇽 Åland Islands
+🇦🇿 Azerbaijan
+🇧🇦 Bosnia & Herzegovina
+🇧🇧 Barbados
+🇧🇩 Bangladesh
+🇧🇪 Belgium
+🇧🇫 Burkina Faso
+🇧🇬 Bulgaria
+🇧🇭 Bahrain
+🇧🇮 Burundi
+🇧🇯 Benin
+🇧🇱 St. Barthélemy
+🇧🇲 Bermuda
+🇧🇳 Brunei
+🇧🇴 Bolivia
+🇧🇶 Caribbean Netherlands
+🇧🇷 Brazil
+🇧🇸 Bahamas
+🇧🇹 Bhutan
+🇧🇻 Bouvet Island
+🇧🇼 Botswana
+🇧🇾 Belarus
+🇧🇿 Belize
+🇨🇦 Canada
+🇨🇨 Cocos (Keeling) Islands
+🇨🇩 Congo - Kinshasa
+🇨🇫 Central African Republic
+🇨🇬 Congo - Brazzaville
+🇨🇭 Switzerland
+🇨🇮 Côte d’Ivoire
+🇨🇰 Cook Islands
+🇨🇱 Chile
+🇨🇲 Cameroon
+🇨🇳 China
+🇨🇴 Colombia
+🇨🇵 Clipperton Island
+🇨🇷 Costa Rica
+🇨🇺 Cuba
+🇨🇻 Cape Verde
+🇨🇼 Curaçao
+🇨🇽 Christmas Island
+🇨🇾 Cyprus
+🇨🇿 Czechia
+🇩🇪 Germany
+🇩🇬 Diego Garcia
+🇩🇯 Djibouti
+🇩🇰 Denmark
+🇩🇲 Dominica
+🇩🇴 Dominican Republic
+🇩🇿 Algeria
+🇪🇦 Ceuta & Melilla
+🇪🇨 Ecuador
+🇪🇪 Estonia
+🇪🇬 Egypt
+🇪🇭 Western Sahara
+🇪🇷 Eritrea
+🇪🇸 Spain
+🇪🇹 Ethiopia
+🇪🇺 European Union
+🇫🇮 Finland
+🇫🇯 Fiji
+🇫🇰 Falkland Islands
+🇫🇲 Micronesia
+🇫🇴 Faroe Islands
+🇫🇷 France
+🇬🇦 Gabon
+🇬🇧 United Kingdom
+🇬🇩 Grenada
+🇬🇪 Georgia
+🇬🇫 French Guiana
+🇬🇬 Guernsey
+🇬🇭 Ghana
+🇬🇮 Gibraltar
+🇬🇱 Greenland
+🇬🇲 Gambia
+🇬🇳 Guinea
+🇬🇵 Guadeloupe
+🇬🇶 Equatorial Guinea
+🇬🇷 Greece
+🇬🇸 South Georgia & South Sandwich Islands
+🇬🇹 Guatemala
+🇬🇺 Guam
+🇬🇼 Guinea-Bissau
+🇬🇾 Guyana
+🇭🇰 Hong Kong SAR China
+🇭🇲 Heard & McDonald Islands
+🇭🇳 Honduras
+🇭🇷 Croatia
+🇭🇹 Haiti
+🇭🇺 Hungary
+🇮🇨 Canary Islands
+🇮🇩 Indonesia
+🇮🇪 Ireland
+🇮🇱 Israel
+🇮🇲 Isle of Man
+🇮🇳 India
+🇮🇴 British Indian Ocean Territory
+🇮🇶 Iraq
+🇮🇷 Iran
+🇮🇸 Iceland
+🇮🇹 Italy
+🇯🇪 Jersey
+🇯🇲 Jamaica
+🇯🇴 Jordan
+🇯🇵 Japan
+🇰🇪 Kenya
+🇰🇬 Kyrgyzstan
+🇰🇭 Cambodia
+🇰🇮 Kiribati
+🇰🇲 Comoros
+🇰🇳 St. Kitts & Nevis
+🇰🇵 North Korea
+🇰🇷 South Korea
+🇰🇼 Kuwait
+🇰🇾 Cayman Islands
+🇰🇿 Kazakhstan
+🇱🇦 Laos
+🇱🇧 Lebanon
+🇱🇨 St. Lucia
+🇱🇮 Liechtenstein
+🇱🇰 Sri Lanka
+🇱🇷 Liberia
+🇱🇸 Lesotho
+🇱🇹 Lithuania
+🇱🇺 Luxembourg
+🇱🇻 Latvia
+🇱🇾 Libya
+🇲🇦 Morocco
+🇲🇨 Monaco
+🇲🇩 Moldova
+🇲🇪 Montenegro
+🇲🇫 St. Martin
+🇲🇬 Madagascar
+🇲🇭 Marshall Islands
+🇲🇰 North Macedonia
+🇲🇱 Mali
+🇲🇲 Myanmar (Burma)
+🇲🇳 Mongolia
+🇲🇴 Macau Sar China
+🇲🇵 Northern Mariana Islands
+🇲🇶 Martinique
+🇲🇷 Mauritania
+🇲🇸 Montserrat
+🇲🇹 Malta
+🇲🇺 Mauritius
+🇲🇻 Maldives
+🇲🇼 Malawi
+🇲🇽 Mexico
+🇲🇾 Malaysia
+🇲🇿 Mozambique
+🇳🇦 Namibia
+🇳🇨 New Caledonia
+🇳🇪 Niger
+🇳🇫 Norfolk Island
+🇳🇬 Nigeria
+🇳🇮 Nicaragua
+🇳🇱 Netherlands
+🇳🇴 Norway
+🇳🇵 Nepal
+🇳🇷 Nauru
+🇳🇺 Niue
+🇳🇿 New Zealand
+🇴🇲 Oman
+🇵🇦 Panama
+🇵🇪 Peru
+🇵🇫 French Polynesia
+🇵🇬 Papua New Guinea
+🇵🇭 Philippines
+🇵🇰 Pakistan
+🇵🇱 Poland
+🇵🇲 St. Pierre & Miquelon
+🇵🇳 Pitcairn Islands
+🇵🇷 Puerto Rico
+🇵🇸 Palestinian Territories
+🇵🇹 Portugal
+🇵🇼 Palau
+🇵🇾 Paraguay
+🇶🇦 Qatar
+🇷🇪 Réunion
+🇷🇴 Romania
+🇷🇸 Serbia
+🇷🇺 Russia
+🇷🇼 Rwanda
+🇸🇦 Saudi Arabia
+🇸🇧 Solomon Islands
+🇸🇨 Seychelles
+🇸🇩 Sudan
+🇸🇪 Sweden
+🇸🇬 Singapore
+🇸🇭 St. Helena
+🇸🇮 Slovenia
+🇸🇯 Svalbard & Jan Mayen
+🇸🇰 Slovakia
+🇸🇱 Sierra Leone
+🇸🇲 San Marino
+🇸🇳 Senegal
+🇸🇴 Somalia
+🇸🇷 Suriname
+🇸🇸 South Sudan
+🇸🇹 São Tomé & Príncipe
+🇸🇻 El Salvador
+🇸🇽 Sint Maarten
+🇸🇾 Syria
+🇸🇿 Swaziland
+🇹🇦 Tristan Da Cunha
+🇹🇨 Turks & Caicos Islands
+🇹🇩 Chad
+🇹🇫 French Southern Territories
+🇹🇬 Togo
+🇹🇭 Thailand
+🇹🇯 Tajikistan
+🇹🇰 Tokelau
+🇹🇱 Timor-Leste
+🇹🇲 Turkmenistan
+🇹🇳 Tunisia
+🇹🇴 Tonga
+🇹🇷 Turkey
+🇹🇹 Trinidad & Tobago
+🇹🇻 Tuvalu
+🇹🇼 Taiwan
+🇹🇿 Tanzania
+🇺🇦 Ukraine
+🇺🇬 Uganda
+🇺🇲 U.S. Outlying Islands
+🇺🇳 United Nations
+🇺🇸 United States
+🇺🇾 Uruguay
+🇺🇿 Uzbekistan
+🇻🇦 Vatican City
+🇻🇨 St. Vincent & Grenadines
+🇻🇪 Venezuela
+🇻🇬 British Virgin Islands
+🇻🇮 U.S. Virgin Islands
+🇻🇳 Vietnam
+🇻🇺 Vanuatu
+🇼🇫 Wallis & Futuna
+🇼🇸 Samoa
+🇽🇰 Kosovo
+🇾🇪 Yemen
+🇾🇹 Mayotte
+🇿🇦 South Africa
+🇿🇲 Zambia
+🇿🇼 Zimbabwe
+🏴󠁧󠁢󠁥󠁮󠁧󠁿 England
+🏴󠁧󠁢󠁳󠁣󠁴󠁿 Scotland
+🏴󠁿 Wales
diff --git a/.scripts/statusbar/locate b/.scripts/statusbar/locate
index 96e2e865..1f307b2d 100755
--- a/.scripts/statusbar/locate
+++ b/.scripts/statusbar/locate
@@ -10,5 +10,4 @@
 #
 ifinstalled "geoiplookup" || exit
 addr="$(curl ifconfig.me 2>/dev/null)"
-country="$(geoiplookup $addr | awk '{print $5}')"
-printf "%s" "$(sed -n /$country/p ~/.local/share/larbs/flag-emojis)"
+grep "$(geoiplookup $addr | sed 's/.*, //')" ~/.local/share/flag-emojis