diff --git a/installer/installer.sh b/installer/installer.sh index 8396d05..4332aef 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -452,12 +452,12 @@ function installconf { # # Var allpackages have in this moment all the packages selected by user, and will be the install packages list for pacman # - # Do allpackages var contain base packages and NTP daemon (Hour sync) - allpackages=$allpackages" jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils bash-completion ntp" + # Do allpackages var contain base packages, NTP (Clock sync) and jkarch needed files + allpackages=$allpackages" jka-toolkit jkarch-data git wget netctl iw wpa_supplicant dialog sudo alsa-utils bash-completion ntp" #Mate desktop and apps allpackages=$allpackages" xfce4 gtk-engine-murrine faenza-icon-theme xfce4-notifyd xfconf gtk-xfce-engine" - allpackages=$allpackages" xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks2 networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager lxtask xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin" + allpackages=$allpackages" xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks2 networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs xfce4-power-manager lxtask xfce4-whiskermenu-plugin xfce4-pulseaudio-plugin" # Standard packages allpackages="$allpackages flashplugin pepper-flash evince ristretto librsvg gnome-calculator gnome-disk-utility file-roller lrzip p7zip unace unrar tumbler poppler-glib ffmpegthumbnailer libgsf notepadqq leafpad libreoffice-fresh vlc qt4 noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-dejavu ttf-liberation ttf-ms-fonts" @@ -474,6 +474,7 @@ function installconf { # Before install, configure mirrorlist execl chroot reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist + # Here, allpackages have the user selected packages because selected before. Then, install it execl chroot pacman -Syu $allpackages --noconfirm --needed @@ -491,9 +492,6 @@ function installconf { execl chroot hwclock --systohc --utc execl chroot systemctl enable ntpd - # User and desktop skel - tar xJf /root/skeluser.tar.xz -C /mnt/ - # Create user execl chroot useradd -m -G wheel -s /bin/bash $nameuser echo "${nameuser}:${passuser}" | execl chroot chpasswd @@ -633,7 +631,7 @@ if [[ ! -f "jkarch" ]];then wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O /root/translations.sh ; isanetworkerror wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/skeluser.tar.xz -O /root/skeluser.tar.xz ; isanetworkerror wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/pacman.conf -O /root/pacman.conf ; isanetworkerror - wget -nv https://mirror.jkanetwork.com/Arch-repository/jkarch-mirrorlist -O /etc/pacman.d/jkarch-mirrorlist ; isanetworkerror #Goes to final location directly + wget -nv https://mirror.jkanetwork.com/Arch-repository/jkarch-mirrorlist -O /etc/pacman.d/jkarch-mirrorlist ; isanetworkerror #Goes to live image for download better base things showdo "Downloaded JKArch scripts and data" "2" #Enable pacman diff --git a/installer/jkarch-appearance.tar.xz b/installer/jkarch-data.tar.xz similarity index 76% rename from installer/jkarch-appearance.tar.xz rename to installer/jkarch-data.tar.xz index 96ba0cd..2a8da35 100644 Binary files a/installer/jkarch-appearance.tar.xz and b/installer/jkarch-data.tar.xz differ diff --git a/installer/skeluser.tar.xz b/installer/skeluser.tar.xz deleted file mode 100644 index b3f117a..0000000 Binary files a/installer/skeluser.tar.xz and /dev/null differ