root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-yaml] prepare for GIS

Browse source
This commit is contained in:
Philip Müller 2021-05-28 10:50:36 +02:00
parent 4bdb473250
commit c10c4d5e8f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/util-yaml.sh
View file

@ -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