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

Remove skel copy to user home, lump package installs together

Browse Source
This commit is contained in:
natemaia 2019-01-12 03:16:19 -08:00
parent c61b64f731
commit e0bb71db98
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/archlabs-installer
View File

@ -8,7 +8,7 @@
# Some ideas and code has been taken from other installers # Some ideas and code has been taken from other installers
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due # AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
VER="1.8.14" # version VER="1.8.15" # version
DIST="ArchLabs" # distributor DIST="ArchLabs" # distributor
MNT="/mnt" # mountpoint MNT="/mnt" # mountpoint
@ -1306,8 +1306,6 @@ create_user()
echeck "useradd -m -u 1000 -g users -G $groups -s $MYSHELL $NEWUSER" echeck "useradd -m -u 1000 -g users -G $groups -s $MYSHELL $NEWUSER"
chrun "chpasswd <<< '$NEWUSER:$USER_PASS'" chrun "chpasswd <<< '$NEWUSER:$USER_PASS'"
cp -rfv /etc/skel/. $MNT/home/$NEWUSER/
# for neovim set up ~/.config/nvim # for neovim set up ~/.config/nvim
if [[ $PACKAGES =~ neovim ]]; then if [[ $PACKAGES =~ neovim ]]; then
mkdir -p $MNT/home/$NEWUSER/.config/nvim mkdir -p $MNT/home/$NEWUSER/.config/nvim
@ -1468,13 +1466,12 @@ package_operations()
fi fi
chrun "pacman -Rns $rmpkg --noconfirm" chrun "pacman -Rns $rmpkg --noconfirm"
chrun "pacman -S iputils --noconfirm" chrun "pacman -S iputils --noconfirm"
chrun "pacman -S $inpkg --needed --noconfirm" chrun "pacman -S $inpkg archlabs-common archlabs-dARK archlabs-icons archlabs-scripts archlabs-skel-base archlabs-wallpapers gtk-engine-murrine gtk3 pavucontrol tumbler base base-devel sudo git udisks2 mesa xorg-server xorg-apps xorg-drivers playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good --needed --noconfirm"
chrun "pacman -S archlabs-common archlabs-dARK archlabs-icons archlabs-scripts archlabs-skel-base archlabs-wallpapers gtk-engine-murrine gtk3 pavucontrol xdg-user-dirs tumbler base base-devel sudo git udisks2 mesa xorg-server xorg-apps xorg-drivers playerctl ffmpeg gstreamer libmad libmatroska gst-libav gst-plugins-base gst-plugins-good --needed --noconfirm"
if [[ $LOGIN_TYPE == 'xinit' ]]; then if [[ $LOGIN_TYPE == 'xinit' ]]; then
chrun "pacman -S xorg-xinit --needed --noconfirm" chrun "pacman -S xorg-xinit --needed --noconfirm"
fi fi
if [[ $inpkg =~ (openbox|dwm|bspwm|i3) ]]; then if [[ $inpkg =~ (openbox|dwm|bspwm|i3) ]]; then
chrun "pacman -S arandr archlabs-networkmanager-dmenu nitrogen polkit-gnome volumeicon xclip xdotool compton gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings laptop-detect --needed --noconfirm" chrun "pacman -S arandr archlabs-networkmanager-dmenu xdg-user-dirs nitrogen polkit-gnome volumeicon xclip xdotool compton gnome-keyring dunst feh gsimplecal xfce4-power-manager xfce4-settings laptop-detect --needed --noconfirm"
fi fi
sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" $MNT/etc/sudoers sed -i "s/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" $MNT/etc/sudoers
@ -2708,10 +2705,12 @@ for arg in "$@"; do
done done
# initial prep # initial prep
# select_language
#select_language
src $LNG/english.trans src $LNG/english.trans
FONT="ter-i16n" FONT="ter-i16n"
LOC="en_US.UTF-8" LOC="en_US.UTF-8"
select_keymap select_keymap
system_checks system_checks
system_identify system_identify