Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

more white-space cleaning

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-12 16:54:20 +01:00
parent 8f74c53807
commit 59503579f8
1 changed files with 110 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manjaro-architect
View File

@ -323,6 +323,7 @@ dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_MirrorlistTitle " \
esac esac
configure_mirrorlist configure_mirrorlist
} }
# virtual console keymap # virtual console keymap
@ -341,6 +342,7 @@ set_keymap() {
check_for_error check_for_error
echo -e "KEYMAP=${KEYMAP}\nFONT=${FONT}" > /tmp/vconsole.conf echo -e "KEYMAP=${KEYMAP}\nFONT=${FONT}" > /tmp/vconsole.conf
} }
# Set keymap for X11 # Set keymap for X11
@ -375,6 +377,7 @@ set_locale() {
sed -i "s/#${LOCALE}/${LOCALE}/" ${MOUNTPOINT}/etc/locale.gen 2>/tmp/.errlog sed -i "s/#${LOCALE}/${LOCALE}/" ${MOUNTPOINT}/etc/locale.gen 2>/tmp/.errlog
arch_chroot "locale-gen" >/dev/null 2>>/tmp/.errlog arch_chroot "locale-gen" >/dev/null 2>>/tmp/.errlog
check_for_error check_for_error
} }
# Set Zone and Sub-Zone # Set Zone and Sub-Zone
@ -404,6 +407,7 @@ set_timezone() {
else else
config_base_menu config_base_menu
fi fi
} }
set_hw_clock() { set_hw_clock() {
@ -413,6 +417,7 @@ set_hw_clock() {
"localtime" "-" 2>${ANSWER} "localtime" "-" 2>${ANSWER}
[[ $(cat ${ANSWER}) != "" ]] && arch_chroot "hwclock --systohc --$(cat ${ANSWER})" 2>/tmp/.errlog && check_for_error [[ $(cat ${ANSWER}) != "" ]] && arch_chroot "hwclock --systohc --$(cat ${ANSWER})" 2>/tmp/.errlog && check_for_error
} }
# Function will not allow incorrect UUID type for installed system. # Function will not allow incorrect UUID type for installed system.
@ -447,6 +452,7 @@ set_hostname() {
echo "$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hostname 2>/tmp/.errlog echo "$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hostname 2>/tmp/.errlog
echo -e "#<ip-address>\t<hostname.domain.org>\t<hostname>\n127.0.0.1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})\n::1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hosts 2>>/tmp/.errlog echo -e "#<ip-address>\t<hostname.domain.org>\t<hostname>\n127.0.0.1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})\n::1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hosts 2>>/tmp/.errlog
check_for_error check_for_error
} }
# Adapted and simplified from the Manjaro 0.8 and Antergos 2.0 installers # Adapted and simplified from the Manjaro 0.8 and Antergos 2.0 installers
@ -509,6 +515,7 @@ create_new_user() {
# create new user. This step will only be reached where the password loop has been skipped or broken. # create new user. This step will only be reached where the password loop has been skipped or broken.
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ConfUsrNew " --infobox "$_NUsrSetBody" 0 0 dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_ConfUsrNew " --infobox "$_NUsrSetBody" 0 0
sleep 2 sleep 2
# Create the user, set password, then remove temporary password file # Create the user, set password, then remove temporary password file
arch_chroot "groupadd ${USER}" arch_chroot "groupadd ${USER}"
arch_chroot "useradd ${USER} -m -g ${USER} -G wheel,storage,power,network,video,audio,lp -s /bin/$shell" 2>/tmp/.errlog arch_chroot "useradd ${USER} -m -g ${USER} -G wheel,storage,power,network,video,audio,lp -s /bin/$shell" 2>/tmp/.errlog
@ -517,6 +524,7 @@ create_new_user() {
arch_chroot "passwd ${USER}" < /tmp/.passwd >/dev/null 2>/tmp/.errlog arch_chroot "passwd ${USER}" < /tmp/.passwd >/dev/null 2>/tmp/.errlog
rm /tmp/.passwd rm /tmp/.passwd
check_for_error check_for_error
# Set up basic configuration files and permissions for user # Set up basic configuration files and permissions for user
#arch_chroot "cp /etc/skel/.bashrc /home/${USER}" #arch_chroot "cp /etc/skel/.bashrc /home/${USER}"
arch_chroot "chown -R ${USER}:${USER} /home/${USER}" arch_chroot "chown -R ${USER}:${USER} /home/${USER}"