From: hayao <shun819.mail@gmail.com>
Date: Sun, 2 Aug 2020 12:22:49 +0000 (+0900)
Subject: [update] : Removed locale-mirror
X-Git-Tag: rc3-alpha1~193^2~36
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=20f0a78408a8e7a75a279653204574de9909a715;p=alterlinux%2Falterlinux.git

[update] : Removed locale-mirror
---

diff --git a/build.sh b/build.sh
index b4062040..2dd31c00 100755
--- a/build.sh
+++ b/build.sh
@@ -528,7 +528,6 @@ prepare_build() {
         save_var locale_gen_name
         save_var locale_name
         save_var locale_time
-        save_var locale_mirror
         save_var locale_config_file
         save_var locale_config_line
         save_var locale_version
@@ -1250,10 +1249,9 @@ parse_files() {
     locale_config_line="$(cat "${locale_config_file}" | grep -h -v ^'#' | grep -v ^$ | head -n "${locale_line_number}" | tail -n 1)"
 
     locale_gen_name=$(echo ${locale_config_line} | awk '{print $2}')
-    locale_mirror=$(echo ${locale_config_line} | awk '{print $3}')
-    locale_version=$(echo ${locale_config_line} | awk '{print $4}')
-    locale_time=$(echo ${locale_config_line} | awk '{print $5}')
-    locale_fullname=$(echo ${locale_config_line} | awk '{print $6}')
+    locale_version=$(echo ${locale_config_line} | awk '{print $3}')
+    locale_time=$(echo ${locale_config_line} | awk '{print $4}')
+    locale_fullname=$(echo ${locale_config_line} | awk '{print $5}')
 
 
     # Parse kernel
diff --git a/system/locale-i686 b/system/locale-i686
index e752e9f9..8ac6059a 100644
--- a/system/locale-i686
+++ b/system/locale-i686
@@ -7,15 +7,15 @@
 # 
 # locale list
 #
-# <locale name>     <locale.gen>     <archlinux mirror>     <lang version name>     <timezone>     <fullname>
+# <locale name>     <locale.gen>     <lang version name>     <timezone>     <fullname>
 #
 
 # Global version
-gl                  en_US.UTF-8      all                    gl                      UTC            global 
+gl                  en_US.UTF-8      gl                      UTC            global 
 
 # Japanese
-ja                  ja_JP.UTF-8      JP                     ja                      Asia/Tokyo     japanese
+ja                  ja_JP.UTF-8      ja                      Asia/Tokyo     japanese
 
 # English
-en                  en_US.UTF-8      US                     en                      UTC            english
+en                  en_US.UTF-8      en                      UTC            english
 
diff --git a/system/locale-x86_64 b/system/locale-x86_64
index d098f374..fd30480b 100644
--- a/system/locale-x86_64
+++ b/system/locale-x86_64
@@ -7,14 +7,14 @@
 # 
 # locale list
 #
-# <locale name>     <locale.gen>     <archlinux mirror>     <lang version name>     <timezone>     <fullname>
+# <locale name>     <locale.gen>     <lang version name>     <timezone>     <fullname>
 #
 
 # Global version
-gl                  en_US.UTF-8      all                    gl                      UTC            global 
+gl                  en_US.UTF-8      gl                      UTC            global 
 
 # Japanese
-ja                  ja_JP.UTF-8      JP                     ja                      Asia/Tokyo     japanese
+ja                  ja_JP.UTF-8      ja                      Asia/Tokyo     japanese
 
 # English
-en                  en_US.UTF-8      US                     en                      UTC            english
+en                  en_US.UTF-8      en                      UTC            english