jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-16 18:21:33 +01:00
Code Issues Releases Wiki Activity

changes (DEV)

Browse Source
This commit is contained in:
JKA Network
2016-12-22 13:06:07 +00:00
parent b1e12cf04a
commit 4fcc35010d
2 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
archinstall/archinstall-dev.sh
View File

@@ -377,8 +377,7 @@ allpackages=$allpackages" "$pak
$pak="ntpd"
allpackages=$allpackages" "$pak
##GUI and apps
##GUI and apps selected in "entorno{}"
#Here, allpackages have the user selected packages because selected before.
@@ -406,7 +405,7 @@ echo "Clock will not be okay until restart and configure manually because you do
fi
#usuarios
#users
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/skel.tar.xz -C /mnt/
else #online
@@ -414,29 +413,29 @@ wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.xz -O- |
fi
#Themes skel before creating user and remove some progs
if [[ $optentorno = 1 ]];then #LXDE
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/LXDE.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C /mnt/
if [[ $optentorno = 1 ]];then #LXDE
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/LXDE.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/LXDE.tar.xz -O- | tar xJf - -C /mnt/
fi
fi
fi
if [[ $optentorno = 2 ]];then #XFCE4
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/XFCE4.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C /mnt/
if [[ $optentorno = 2 ]];then #XFCE4
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/XFCE4.tar.xz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/XFCE4.tar.xz -O- | tar xJf - -C /mnt/
fi
fi
fi
if [[ $optentorno = 4 ]];then #GDM remove in gnome
execl chroot pacman -R gdm --noconfirm
fi
if [[ $optentorno = 4 ]];then #GDM remove in gnome
execl chroot pacman -R gdm --noconfirm
fi
if [[ $optentorno = 6 ]];then #Plasma, remove 2 apps
execl chroot pacman -R plasma-mediacenter ksshaskpass --noconfirm
fi
if [[ $optentorno = 6 ]];then #Plasma, remove 2 apps
execl chroot pacman -R plasma-mediacenter ksshaskpass --noconfirm
fi
#user
@@ -467,12 +466,12 @@ if [[ $inswine = 1 ]];then
fi
### Set X11 keyboard ###
# Set X11 keyboard
if [[ $optentorno != 7 ]];then
keyboardlayout
keyboardlayout
fi
#Install and configure bootloader
#Install and configure bootloader GRUB/rEFInd
if [[ -z $partefi ]];then #If it dont have EFI
case $optboot in
1)
@@ -514,8 +513,7 @@ echo "JKArch" > /mnt/etc/hostname
#Linux
execl chroot mkinitcpio -p linux #Hacemos el mkinitcpio después de tener instalados los gráficos
#GRUB/rEFInd
bootinstall
#Tweaks
echo "$(T "Last tweaks and cleaning")"
@@ -834,7 +832,7 @@ echo ' Option "XkbLayout" "'$langabr'"' >> /mnt/etc/X11/xorg.conf.d/00-keyboa
echo 'EndSection' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
}
function bootinstall {
function bootselect {
if [[ -z $partefi ]];then
#Si no usa EFI, preguntar por instalar GRUB
@@ -842,8 +840,7 @@ if [[ -z $partefi ]];then
case $optboot in
2)
#No hará nada
##TODO DIALOG##
echo "$(T "No new bootloader installed")"
mostrardialog "Bootloader" "$(T "No new bootloader will be installed")"
;;
esac
else
@@ -852,8 +849,7 @@ else
case $optboot in
3)
#No hará nada
##TODO DIALOG##
echo "$(T "No new bootloader installed")"
mostrardialog "Bootloader" "$(T "No new bootloader will be installed")"
;;
esac
fi
@@ -899,6 +895,9 @@ fi
#Se crea el usuario despues del entorno pero antes de instalar más (para una correcta configuración) y se añaden los ficheros de configuracion de skel
userpass
#GRUB/rEFInd select
bootselect
clear
# Resumen de los cambios
tput setaf 6

7
archinstall/translations.sh
View File

@@ -274,7 +274,12 @@ case "$1" in
esac;;
"No new bootloader installed")
case $sclang in
"es") echo "No se ha instalado ningun gestor de arranque en el sistema";;
"es") echo "No se ha instalado ningun gestor de arranque nuevo en el sistema";;
*) echo "$1";;
esac;;
"No new bootloader will be installed")
case $sclang in
"es") echo "No se instalara ningun gestor de arranque nuevo en el sistema";;
*) echo "$1";;
esac;;
"Other configs")