[release] 0.15.11

- fix array

Makefile

@@ -1,4 +1,4 @@
-Version=0.15.10
+Version=0.15.11
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc

bin/mkchroot.in

@@ -115,11 +115,12 @@ if ${build_locales}; then
     printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
     printf 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
     printf 'LC_MESSAGES=C\n' >> "$working_dir/etc/locale.conf"
-fi
 
-chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} ${cache_dir:+-c "$cache_dir"} ${keep_flag})
+    chroot_args=(${pac_conf:+-C "$pac_conf"} ${makepkg_conf:+-M "$makepkg_conf"} \
+                 ${mirrors_conf:+-S "$mirrors_conf"} ${build_mirror:+-B "$build_mirror"} \
+                 ${cache_dir:+-c "$cache_dir"} ${keep_flag})
 
     exec chroot-run \
         ${chroot_args[*]} \
         "$working_dir" locale-gen
-
+fi

lib/util-yaml.sh

@@ -290,14 +290,14 @@ write_settings_conf(){
     echo "sequence:" >> "$conf"
     echo "    - show:" >> "$conf"
     echo "        - welcome" >> "$conf" && write_welcome_conf
-    if ${oem_used}; then
+    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
         msg2 "Skipping to show locale and keyboard modules."
     else
         echo "        - locale" >> "$conf" && write_locale_conf
         echo "        - keyboard" >> "$conf"
     fi
     echo "        - partition" >> "$conf"
-    if ${oem_used}; then
+    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
         msg2 "Skipping to show users module."
     else
         echo "        - users" >> "$conf" && write_users_conf
@@ -333,7 +333,7 @@ write_settings_conf(){
     fi
     echo "        - machineid" >> "$conf" && write_machineid_conf
     echo "        - fstab" >> "$conf"
-    if ${oem_used}; then
+    if ${oem_used} || [[ ${profile} == "gnome" ]]; then
         msg2 "Skipping to set locale, keyboard and localecfg modules."
     else
         echo "        - locale" >> "$conf"
@@ -347,6 +347,8 @@ write_settings_conf(){
     if ${oem_used}; then
         msg2 "Skipping to set users module."
         echo "        - oemuser" >> "$conf"
+    elif [[ ${profile} == "gnome" ]]; then
+        msg2 "Skipping to set users module."
     else
         echo "        - users" >> "$conf"
     fi