lots of merge fixes

dialog
Matt C 3 years ago committed by michal
parent 8afe15cf57
commit ca20775669

@ -48,6 +48,7 @@ echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
echo "LANG=en_US.UTF-8" > /etc/locale.conf echo "LANG=en_US.UTF-8" > /etc/locale.conf
clear clear
<<<<<<< HEAD
yesno "Do you need more locales than just en_US?" yesno "Do you need more locales than just en_US?"
echo "MORE=$yn" echo "MORE=$yn"
MORE="$yn" MORE="$yn"
@ -64,6 +65,17 @@ if [[ "$MORE" == "0" ]]; then
dump "When we open the file, please remove the leading # before any locales you need.\ dump "When we open the file, please remove the leading # before any locales you need.\
Then, save and exit." Then, save and exit."
${PGRM} /etc/locale.gen ${PGRM} /etc/locale.gen
=======
prompt "Do you need more locales than just en_US? (y/N)"
echo "MORE=$response"
MORE="$response"
if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then
inf "When we open the file, please remove the leading # before any locales you need."
inf "Then, save and exit.\nPress enter."
read
micro /etc/locale.gen
>>>>>>> a911136 (ok sorry (not) we're using micro now)
fi fi
inf "Generating selected locales." inf "Generating selected locales."

Loading…
Cancel
Save