forked from mirrored-repos/manjaro-tools
Compare commits
12 commits
master
...
gnome-init
Author | SHA1 | Date | |
---|---|---|---|
|
f9fdcad3a3 | ||
|
6c07c3286b | ||
|
0f896a2918 | ||
|
7b6fe03c3a | ||
|
9e36cc99c2 | ||
|
28db47e276 | ||
|
f3118097b9 | ||
|
109bf845a8 | ||
|
a2cd3f5c3f | ||
|
c122eef1f7 | ||
|
8a8bf8487a | ||
|
a48c76c6a2 |
3 changed files with 14 additions and 11 deletions
2
Makefile
2
Makefile
|
@ -1,4 +1,4 @@
|
||||||
Version=0.15.10
|
Version=0.15.11
|
||||||
|
|
||||||
PREFIX = /usr/local
|
PREFIX = /usr/local
|
||||||
SYSCONFDIR = /etc
|
SYSCONFDIR = /etc
|
||||||
|
|
|
@ -115,11 +115,12 @@ if ${build_locales}; then
|
||||||
printf '%s.UTF-8 UTF-8\n' en_US > "$working_dir/etc/locale.gen"
|
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 'LANG=%s.UTF-8\n' en_US > "$working_dir/etc/locale.conf"
|
||||||
printf 'LC_MESSAGES=C\n' >> "$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 \
|
exec chroot-run \
|
||||||
${chroot_args[*]} \
|
${chroot_args[*]} \
|
||||||
"$working_dir" locale-gen
|
"$working_dir" locale-gen
|
||||||
|
fi
|
||||||
|
|
|
@ -290,14 +290,14 @@ write_settings_conf(){
|
||||||
echo "sequence:" >> "$conf"
|
echo "sequence:" >> "$conf"
|
||||||
echo " - show:" >> "$conf"
|
echo " - show:" >> "$conf"
|
||||||
echo " - welcome" >> "$conf" && write_welcome_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."
|
msg2 "Skipping to show locale and keyboard modules."
|
||||||
else
|
else
|
||||||
echo " - locale" >> "$conf" && write_locale_conf
|
echo " - locale" >> "$conf" && write_locale_conf
|
||||||
echo " - keyboard" >> "$conf"
|
echo " - keyboard" >> "$conf"
|
||||||
fi
|
fi
|
||||||
echo " - partition" >> "$conf"
|
echo " - partition" >> "$conf"
|
||||||
if ${oem_used}; then
|
if ${oem_used} || [[ ${profile} == "gnome" ]]; then
|
||||||
msg2 "Skipping to show users module."
|
msg2 "Skipping to show users module."
|
||||||
else
|
else
|
||||||
echo " - users" >> "$conf" && write_users_conf
|
echo " - users" >> "$conf" && write_users_conf
|
||||||
|
@ -333,7 +333,7 @@ write_settings_conf(){
|
||||||
fi
|
fi
|
||||||
echo " - machineid" >> "$conf" && write_machineid_conf
|
echo " - machineid" >> "$conf" && write_machineid_conf
|
||||||
echo " - fstab" >> "$conf"
|
echo " - fstab" >> "$conf"
|
||||||
if ${oem_used}; then
|
if ${oem_used} || [[ ${profile} == "gnome" ]]; then
|
||||||
msg2 "Skipping to set locale, keyboard and localecfg modules."
|
msg2 "Skipping to set locale, keyboard and localecfg modules."
|
||||||
else
|
else
|
||||||
echo " - locale" >> "$conf"
|
echo " - locale" >> "$conf"
|
||||||
|
@ -347,6 +347,8 @@ write_settings_conf(){
|
||||||
if ${oem_used}; then
|
if ${oem_used}; then
|
||||||
msg2 "Skipping to set users module."
|
msg2 "Skipping to set users module."
|
||||||
echo " - oemuser" >> "$conf"
|
echo " - oemuser" >> "$conf"
|
||||||
|
elif [[ ${profile} == "gnome" ]]; then
|
||||||
|
msg2 "Skipping to set users module."
|
||||||
else
|
else
|
||||||
echo " - users" >> "$conf"
|
echo " - users" >> "$conf"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue