[update] : Added locale gen

diff --git a/channels/lxde/airootfs.any/root/customize_airootfs_lxde.sh b/channels/lxde/airootfs.any/root/customize_airootfs_lxde.sh
index a193fd7..2f2a34a 100755 (executable)
--- a/channels/lxde/airootfs.any/root/customize_airootfs_lxde.sh
+++ b/channels/lxde/airootfs.any/root/customize_airootfs_lxde.sh
@@ -23,6 +23,7 @@ install_dir="alter"
 usershell="/bin/bash"
 debug=false
 timezone="UTC"
+localegen="en_US\\.UTF-8\\"
 
 
 # Parse arguments
@@ -40,7 +41,7 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:' arg; do
         d) debug=true ;;
         x) debug=true; set -xv ;;
         a) arch="${OPTARG}" ;;
-        g) language="${OPTARG}" ;;
+        g) localegen="${OPTARG/./\\.}\\" ;;
         z) timezone="${OPTARG}" ;;
     esac
 done

diff --git a/channels/plasma/airootfs.any/root/customize_airootfs_plasma.sh b/channels/plasma/airootfs.any/root/customize_airootfs_plasma.sh
index 8e73e90..79ad8fc 100755 (executable)
--- a/channels/plasma/airootfs.any/root/customize_airootfs_plasma.sh
+++ b/channels/plasma/airootfs.any/root/customize_airootfs_plasma.sh
@@ -16,6 +16,7 @@ install_dir="alter"
 usershell="/bin/bash"
 debug=false
 timezone="UTC"
+localegen="en_US\\.UTF-8\\"
 
 
 # Parse arguments
@@ -33,7 +34,7 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:' arg; do
         d) debug=true ;;
         x) debug=true; set -xv ;;
         a) arch="${OPTARG}" ;;
-        g) language="${OPTARG}" ;;
+        g) localegen="${OPTARG/./\\.}\\" ;;
         z) timezone="${OPTARG}" ;;
     esac
 done

diff --git a/channels/releng/airootfs.any/root/customize_airootfs.sh b/channels/releng/airootfs.any/root/customize_airootfs.sh
index 9f7508b..a58c54d 100755 (executable)
--- a/channels/releng/airootfs.any/root/customize_airootfs.sh
+++ b/channels/releng/airootfs.any/root/customize_airootfs.sh
@@ -23,6 +23,7 @@ install_dir="alter"
 usershell="/bin/bash"
 debug=false
 timezone="UTC"
+localegen="en_US\\.UTF-8\\"
 
 
 # Parse arguments
@@ -40,7 +41,7 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:' arg; do
         d) debug=true ;;
         x) debug=true; set -xv ;;
         a) arch="${OPTARG}" ;;
-        g) language="${OPTARG}" ;;
+        g) localegen="${OPTARG/./\\.}\\" ;;
         z) timezone="${OPTARG}" ;;
     esac
 done

diff --git a/channels/share/airootfs.any/root/customize_airootfs.sh b/channels/share/airootfs.any/root/customize_airootfs.sh
index cc8e199..0294623 100755 (executable)
--- a/channels/share/airootfs.any/root/customize_airootfs.sh
+++ b/channels/share/airootfs.any/root/customize_airootfs.sh
@@ -23,6 +23,7 @@ install_dir="alter"
 usershell="/bin/bash"
 debug=false
 timezone="UTC"
+localegen="en_US\\.UTF-8\\"
 
 
 # Parse arguments
@@ -40,7 +41,7 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:' arg; do
         d) debug=true ;;
         x) debug=true; set -xv ;;
         a) arch="${OPTARG}" ;;
-        g) language="${OPTARG}" ;;
+        g) localegen="${OPTARG/./\\.}\\" ;;
         z) timezone="${OPTARG}" ;;
     esac
 done
@@ -78,8 +79,8 @@ function remove () {
 
 # Enable and generate languages.
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
-if [[ "${language}" = "ja" ]]; then
-    sed -i 's/#\(ja_JP\.UTF-8\)/\1/' /etc/locale.gen
+if [[ ! "${localegen}" == "en_US\\.UTF-8\\" ]]; then
+    sed -i "s/#\(${localegen})/\1/" /etc/locale.gen
 fi
 locale-gen
 

diff --git a/channels/xfce/airootfs.any/root/customize_airootfs_xfce.sh b/channels/xfce/airootfs.any/root/customize_airootfs_xfce.sh
index 130fbb3..eef4f40 100755 (executable)
--- a/channels/xfce/airootfs.any/root/customize_airootfs_xfce.sh
+++ b/channels/xfce/airootfs.any/root/customize_airootfs_xfce.sh
@@ -23,6 +23,7 @@ install_dir="alter"
 usershell="/bin/bash"
 debug=false
 timezone="UTC"
+localegen="en_US\\.UTF-8\\"
 
 
 # Parse arguments
@@ -40,7 +41,7 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:' arg; do
         d) debug=true ;;
         x) debug=true; set -xv ;;
         a) arch="${OPTARG}" ;;
-        g) language="${OPTARG}" ;;
+        g) localegen="${OPTARG/./\\.}\\" ;;
         z) timezone="${OPTARG}" ;;
     esac
 done