mirror of
https://gitlab.com/JKANetwork/JKArch.git
synced 2026-02-15 17:51:33 +01:00
Dev changes
This commit is contained in:
@@ -323,6 +323,7 @@ if [[ $partefi ]];then
|
|||||||
mkdir -p /mnt/boot/efi
|
mkdir -p /mnt/boot/efi
|
||||||
execl mount /dev/$partefi /mnt/boot/efi/
|
execl mount /dev/$partefi /mnt/boot/efi/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## Download or install base system.
|
## Download or install base system.
|
||||||
if [[ $isoffline = "0" ]];then
|
if [[ $isoffline = "0" ]];then
|
||||||
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O pacman.conf
|
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/pacman.conf -O pacman.conf
|
||||||
@@ -341,7 +342,7 @@ if [[ $isoffline = "1" ]];then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
#Create fstab
|
#Create fstab
|
||||||
genfstab -U /mnt > /mnt/etc/fstab
|
execl genfstab -U /mnt > /mnt/etc/fstab
|
||||||
#Create or activate swap if neccesary
|
#Create or activate swap if neccesary
|
||||||
if [[ $swaptype ]];then
|
if [[ $swaptype ]];then
|
||||||
case $swaptype in
|
case $swaptype in
|
||||||
@@ -369,7 +370,7 @@ if [[ $isoffline = 1 ]];then
|
|||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
|
|
||||||
#Do allpackages var contain base packages, and install all.
|
#Do allpackages var contain base packages
|
||||||
$pak="jka-toolkit git wget netctl iw wpa_supplicant reflector dialog sudo alsa-utils dosfstools ntfs-3g bash-completion"
|
$pak="jka-toolkit git wget netctl iw wpa_supplicant reflector dialog sudo alsa-utils dosfstools ntfs-3g bash-completion"
|
||||||
allpackages=$allpackages" "$pak
|
allpackages=$allpackages" "$pak
|
||||||
#For sync
|
#For sync
|
||||||
@@ -377,17 +378,9 @@ $pak="ntpd"
|
|||||||
allpackages=$allpackages" "$pak
|
allpackages=$allpackages" "$pak
|
||||||
|
|
||||||
##GUI and apps
|
##GUI and apps
|
||||||
#Xbase
|
|
||||||
#tput setaf 2 ;echo "$(T "Installing desktop and basic programs, please wait")" ; tput setaf 9
|
|
||||||
|
|
||||||
# Basic programs and audio support
|
|
||||||
if [[ $optentorno != 7 ]];then
|
|
||||||
pak="xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager"
|
|
||||||
#Gestor de energia xfce4-power-manager
|
|
||||||
fi
|
|
||||||
|
|
||||||
clear
|
|
||||||
|
|
||||||
|
#Here, allpackages have the user selected packages because selected before.
|
||||||
|
|
||||||
execl chroot pacman -Syu $allpackages --noconfirm --needed #Install packages , reflector is for updating mirrorlist
|
execl chroot pacman -Syu $allpackages --noconfirm --needed #Install packages , reflector is for updating mirrorlist
|
||||||
|
|
||||||
@@ -788,8 +781,17 @@ case $optentorno in
|
|||||||
#Remove plasma-mediacenter ksshaskpass after, in installconf
|
#Remove plasma-mediacenter ksshaskpass after, in installconf
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#Pass pak to allpackages
|
#Pass pak to allpackages
|
||||||
allpackages=$allpackages" "$pak
|
allpackages=$allpackages" "$pak
|
||||||
|
|
||||||
|
# Basic programs (Xorg) and audio support if there is selected any
|
||||||
|
if [[ $optentorno != 7 ]];then
|
||||||
|
pak="xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb gvfs-afc udisks networkmanager network-manager-applet gnome-keyring xdialog lxterminal ttf-inconsolata octopi octopi-notifier gksu pulseaudio pavucontrol xdg-user-dirs jkarch-appearance xfce4-power-manager"
|
||||||
|
#Gestor de energia xfce4-power-manager
|
||||||
|
allpackages=$allpackages" "$pak
|
||||||
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
### More optional configs ###
|
### More optional configs ###
|
||||||
|
|||||||
Reference in New Issue
Block a user