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

[yaml] remove GIS code

Browse source
This commit is contained in:
Philip Müller 2021-05-29 19:16:39 +02:00
parent 4d9c804384
commit ceacbe0dcc
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/util-yaml.sh
View file

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