augusto/install-arch
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix several issues

Browse Source
This commit is contained in:
Augusto Gunsch 2021-08-10 15:04:03 -03:00
parent b5f7d77488
commit 4791a3f8a9
No known key found for this signature in database
GPG Key ID: F7EEFE29825C72DC
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.sh
View File

@ -228,8 +228,10 @@ setup_grub() {
} }
setup_users() { setup_users() {
echo -n "Configuring users..."
right_chroot /mnt useradd -m "$PERSONAL_USER" right_chroot /mnt useradd -m "$PERSONAL_USER"
right_chroot /mnt echo -e "root:$ROOT_PASSWORD\n$PERSONAL_USER:$PERSONAL_PASSWORD" | chpasswd -q echo -e "root:$ROOT_PASSWORD\n$PERSONAL_USER:$PERSONAL_PASSWORD" | chpasswd -R /mnt
echo "done"
} }
setup_network() { setup_network() {
@ -255,11 +257,13 @@ ask_password() {
stty -echo stty -echo
read USER_PASSWORD read USER_PASSWORD
stty echo stty echo
echo
echo -n "Confirm password: " echo -n "Confirm password: "
stty -echo stty -echo
local PASSWORD_CONFIRM local PASSWORD_CONFIRM
read PASSWORD_CONFIRM read PASSWORD_CONFIRM
stty echo stty echo
echo
if [ "$USER_PASSWORD" != "$PASSWORD_CONFIRM" ]; then if [ "$USER_PASSWORD" != "$PASSWORD_CONFIRM" ]; then
echo "Wrong passwords. Please try again." echo "Wrong passwords. Please try again."
ask_password $1 ask_password $1
@ -293,11 +297,11 @@ prompt_all() {
post_install() { post_install() {
curl -sL "$POST_INSTALL_SCRIPT" -o post-install.sh curl -sL "$POST_INSTALL_SCRIPT" -o post-install.sh
mv post-install /mnt/root mv post-install.sh /mnt/root
chmod +x /mnt/root chmod +x /mnt/root/post-install.sh
echo -n "Ready for post-install script. Press any key to continue..." echo -n "Ready for post-install script. Press any key to continue..."
read dummy read dummy
right_chroot /root/post-install.sh right_chroot /mnt /root/post-install.sh
} }
configure() { configure() {

7
post-install.sh
View File

@ -39,9 +39,10 @@ USER_OUT=""
PACMAN_CONF="/etc/pacman.conf" PACMAN_CONF="/etc/pacman.conf"
PACMAN_TEMP_CONF="/tmp/pacman.conf" PACMAN_TEMP_CONF="/tmp/pacman.conf"
DOAS_CONF="/etc/doas.conf" DOAS_CONF="/etc/doas.conf"
DISTRO=$(lsb_release -is) DISTRO=$(cat /etc/os-release | sed -nE 's/^ID=(.*)/\1/p')
INIT_SYS=$(basename $(readlink /bin/init))
DEFAULT_INCLUDE='/etc/pacman.d/mirrorlist' DEFAULT_INCLUDE='/etc/pacman.d/mirrorlist'
if [ "$DISTRO" != "Arch" -a "$DISTRO" != "Artix" ]; then if [ "$DISTRO" != "arch" -a "$DISTRO" != "artix" ]; then
echo "Error: $(lsb_release -ds) not supported" echo "Error: $(lsb_release -ds) not supported"
usage usage
fi fi
@ -403,7 +404,7 @@ install_doas() {
repos() { repos() {
echo "Detected distro $DISTRO Linux. Proceeding with enabling more repositories." echo "Detected distro $DISTRO Linux. Proceeding with enabling more repositories."
if [ "$DISTRO" = "Artix" ]; then if [ "$DISTRO" = "artix" ]; then
pacman_repo lib32 pacman_repo lib32
local ARCH_REPOS="$DEFAULT_INCLUDE-arch" local ARCH_REPOS="$DEFAULT_INCLUDE-arch"
install archlinux-mirrorlist install archlinux-mirrorlist