root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

util-yaml: fix typo; remove left over check

Browse source
This commit is contained in:
udeved 2016-09-27 19:06:50 +02:00
parent 7d4bb08b06
commit a516b1b19d
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
lib/util-yaml.sh
View file

@ -139,30 +139,28 @@ write_services_conf(){
write_displaymanager_conf(){ write_displaymanager_conf(){
local conf="${modules_dir}/displaymanager.conf" local conf="${modules_dir}/displaymanager.conf"
if ${unpackfs} && ! ${netinstall};then msg2 "Writing %s ..." "${conf##*/}"
msg2 "Writing %s ..." "${conf##*/}" echo "---" > "$conf"
echo "---" > "$conf" if ${unpackfs}; then
if ${unpackfs}; then echo "displaymanagers:" >> "$conf"
echo "displaymanagers:" >> "$conf" echo " - ${displaymanager}" >> "$conf"
echo " - ${displaymanager}" >> "$conf"
echo '' >> "$conf"
if $(is_valid_de); then
echo "defaultDesktopEnvironment:" >> "$conf"
echo " executable: \"${default_desktop_executable}\"" >> "$conf"
echo " desktopFile: \"${default_desktop_file}\"" >> "$conf"
fi
else
echo "displaymanagers:" >> "$conf"
echo " - lightdm" >> "$conf"
echo " - gdm" >> "$conf"
echo " - mdm" >> "$conf"
echo " - sddm" >> "$conf"
echo " - lxdm" >> "$conf"
echo " - silm" >> "$conf"
fi
echo '' >> "$conf" echo '' >> "$conf"
echo "basicSetup: false" >> "$conf" if $(is_valid_de); then
echo "defaultDesktopEnvironment:" >> "$conf"
echo " executable: \"${default_desktop_executable}\"" >> "$conf"
echo " desktopFile: \"${default_desktop_file}\"" >> "$conf"
fi
else
echo "displaymanagers:" >> "$conf"
echo " - lightdm" >> "$conf"
echo " - gdm" >> "$conf"
echo " - mdm" >> "$conf"
echo " - sddm" >> "$conf"
echo " - lxdm" >> "$conf"
echo " - slim" >> "$conf"
fi fi
echo '' >> "$conf"
echo "basicSetup: false" >> "$conf"
} }
write_initcpio_conf(){ write_initcpio_conf(){