xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve -l,--live option

Browse Source
This commit is contained in:
natemaia 2019-08-27 02:15:03 -07:00
parent 927d7ea1cf
commit 741ae95e59
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archlabs-installer
View File

@ -15,7 +15,7 @@
: ${DIST="ArchLabs"}
VER="2.0.62" # installer version
VER="2.0.63" # installer version
MNT="/mnt" # install mountpoint
ANS="/tmp/ans" # dialog answer file
@ -2386,10 +2386,14 @@ msg()
live()
{
pacman -Syy
pacman -S $AL_BASE_PKGS archlabs-skel-openbox openbox xterm xorg-xinit xorg-server --needed --noconfirm
select_keymap || { clear; die 0; }
net_connect || { msg "Not Connected" "\nRunning live requires an active internet connection.\n\nExiting..\n" 2; die 1; }
trap - INT
pacman -Syyu --noconfirm || exit
pacman -S $AL_BASE_PKGS archlabs-skel-openbox openbox xterm xorg-xinit xorg-server --needed --noconfirm || exit
pacman -Scc --noconfirm # these get back some space
rm -rf /var/cache/pacman/pkg/*
cp -rf /etc/skel /root
cp -rfT /etc/skel /root || exit
startx
exit
}
@ -2606,6 +2610,8 @@ elif ! grep -qwm 1 'lm' /proc/cpuinfo; then
die 1
elif [[ $1 =~ (-d|--debug) ]]; then
debug
elif [[ $1 =~ (-l|--live) ]]; then
live
fi
# trap ^C to perform cleanup
@ -2619,7 +2625,6 @@ msg "Welcome to the $DIST Installer" "\nThis will help you get $DIST installed a
select_keymap || { clear; die 0; }
net_connect || { msg "Not Connected" "\nThis installer requires an active internet connection.\n\nExiting..\n" 2; die 1; }
[[ $1 =~ (-l|--live) ]] && live
while :; do
main