root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

correct file editing

Browse source
This commit is contained in:
Tobias Powalowski 2022-11-29 09:48:16 +01:00
parent 6bc93689b7
commit ea630dce36
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
usr/bin/archboot-setup.sh
View file

@ -135,6 +135,7 @@ configure_system() {
set_mkinitcpio
elif [[ "${FILE}" = "/etc/locale.gen" ]]; then # non-file
set_locale
${EDITOR} "${DESTDIR}""${FILE}"
elif [[ "${FILE}" = "Root-Password" ]]; then # non-file
set_password
else #regular file

5
usr/lib/archboot/installer/configuration.sh
View file

@ -31,11 +31,11 @@ set_locale() {
LOCALES="en_US English de_DE German es_ES Spanish fr_FR French pt_PT Portuguese ru_RU Russian OTHER More"
OTHER_LOCALES="$(grep 'UTF' ${DESTDIR}/etc/locale.gen | sed -e 's:#::g' -e 's: UTF-8.*$::g')"
#shellcheck disable=SC2086
DIALOG --menu "Select A Locale:" 14 30 8 ${LOCALES} 2>${ANSWER} || return 1
DIALOG --menu "Select A System-Wide Locale:" 14 30 8 ${LOCALES} 2>${ANSWER} || return 1
set_locale=$(cat ${ANSWER})
if [[ "${set_locale}" == "OTHER" ]]; then
#shellcheck disable=SC2086
DIALOG --menu "Select A Locale:" 18 30 12 ${OTHER_LOCALES} 2>${ANSWER} || return 1
DIALOG --menu "Select A System-Wide Locale:" 18 30 12 ${OTHER_LOCALES} 2>${ANSWER} || return 1
set_locale=$(cat ${ANSWER})
fi
sed -i -e "s#LANG=.*#LANG=${set_locale}#g" "${DESTDIR}"/etc/locale.conf
@ -46,7 +46,6 @@ set_locale() {
for i in $(grep "^LANG" "${DESTDIR}"/etc/locale.conf | sed -e 's/.*=//g' -e's/\..*//g'); do
sed -i -e "s/^#${i}/${i}/g" "${DESTDIR}"/etc/locale.gen
done
${EDITOR} "${DESTDIR}""${FILE}"
}
set_password() {