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

[util-yaml] check for gis

Browse source
This commit is contained in:
Philip Müller 2021-05-29 15:37:28 +02:00
parent c10c4d5e8f
commit e66c9c0f61
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/util-yaml.sh
View file

@ -281,6 +281,11 @@ write_locale_conf(){
fi
}
check_gis(){
has_gis=false
[[ -e $1/usr/lib/gnome-initial-setup ]] && has_gis=true
}
write_settings_conf(){
local conf="$1/etc/calamares/settings.conf"
msg2 "Writing %s ..." "${conf##*/}"
@ -290,14 +295,14 @@ write_settings_conf(){
echo "sequence:" >> "$conf"
echo " - show:" >> "$conf"
echo " - welcome" >> "$conf" && write_welcome_conf
if ${oem_used} || [[ ${profile} == "gnome" ]]; then
if ${oem_used} || ${has_gis}; 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} || [[ ${profile} == "gnome" ]]; then
if ${oem_used} || ${has_gis}; then
msg2 "Skipping to show users module."
else
echo " - users" >> "$conf" && write_users_conf
@ -333,7 +338,7 @@ write_settings_conf(){
fi
echo " - machineid" >> "$conf" && write_machineid_conf
echo " - fstab" >> "$conf"
if ${oem_used}|| [[ ${profile} == "gnome" ]]; then
if ${oem_used}|| ${has_gis}; then
msg2 "Skipping to set locale, keyboard and localecfg modules."
else
echo " - locale" >> "$conf"
@ -347,7 +352,7 @@ write_settings_conf(){
if ${oem_used}; then
msg2 "Skipping to set users module."
echo " - oemuser" >> "$conf"
elif [[ ${profile} == "gnome" ]]; then
elif ${has_gis}; then
msg2 "Skipping to set users module."
else
echo " - users" >> "$conf"