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

[util-yaml] adopt to CAL 3.2.11

Browse source
This commit is contained in:
Philip Müller 2019-07-13 08:22:04 +02:00
parent 1b32aa25b8
commit dfbcb1c2bd
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/util-yaml.sh
View file

@ -187,6 +187,12 @@ write_welcome_conf(){
if ${netinstall}; then
echo " - internet" >> "$conf"
fi
if ${geoip}; then
echo 'geoip:' >> "$conf"
echo ' style: "json"' >> "$conf"
echo ' url: "https://geoip.kde.org/v1/calamares"' >> "$conf"
echo ' selector: ""' >> "$conf"
fi
}
write_mhwdcfg_conf(){
@ -257,9 +263,10 @@ write_locale_conf(){
echo "---" > "$conf"
echo "localeGenPath: /etc/locale.gen" >> "$conf"
if ${geoip}; then
echo "geoipUrl: https://get.geojs.io/v1/ip/geo.json" >> "$conf"
echo "geoipStyle: json" >> "$conf"
echo "geoipSelector: timezone" >> "$conf"
echo 'geoip:' >> "$conf"
echo ' style: "json"' >> "$conf"
echo ' url: "https://geoip.kde.org/v1/calamares"' >> "$conf"
echo ' selector: ""' >> "$conf"
else
echo "region: America" >> "$conf"
echo "zone: New_York" >> "$conf"