jkanetwork/JKArch
1
0
Fork 0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-15 01:31:32 +01:00
Code Issues Releases Wiki Activity

Better

Browse Source
This commit is contained in:
kprkpr
2016-09-28 20:41:33 +02:00
parent d89cb1d0d8
commit 74ff0b9bc2
2 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
archinstall/archinstall.sh
View File

@@ -333,14 +333,10 @@ if [[ $isoffline = 1 ]];then
fi
inchroot pacman -Syu jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools ntfs-3g bash-completion --noconfirm --needed #Install base packages
}
### Date and language ###
function horaidioma {
#Idioma
while [[ $opclang == "" ]];do
varx="" #Empty var
langs=$(cat /mnt/etc/locale.gen | grep '^#[a-zA-Z]' | cut -f1 -d" " | cut -c2-30 | sort | uniq)
@@ -413,6 +409,24 @@ done
echo "${nameuser}:${pass1}" | inchroot chpasswd
pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
#See if user wants to edit root password or not.
opt=`dialog --stdout --nocancel --menu "$(T "You want to edit root (admin) password or set same as user?")" 0 0 4 1 "$(T "Same as user")" 2 "$(T "Edit")"`
case $opt in
1) echo "root:${pass2}" | inchroot chpasswd;;
2) until [[ $pass1 = $pass2 && $pass1 != "" ]]
do
pass1=`dialog --stdout --insecure --passwordbox "$(T "Password for ") . root" 9 50`
pass2=`dialog --stdout --insecure --passwordbox "$(T "Repeat password")" 9 50`
if ! [[ $pass1 = $pass2 && $pass1 != "" ]];then
mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
fi
done
echo "root:${pass1}" | inchroot chpasswd
pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
;;
esac
done
#Añadir soporte sudo para este nuevo usuario
sed -i "s/\# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/g" /mnt/etc/sudoers
#Modificar gksu si lleva una sesion grafica
@@ -549,6 +563,7 @@ fi
packages=""
}
### Install base graphic programs ###
function baseconX {
tput setaf 2 ;echo "$(T "Installing desktop and basic programs, please wait")" ; tput setaf 9
sleep 2
@@ -650,7 +665,7 @@ mostrardialog "$(T "Other configs")" "Aquí puedes seleccionar otras configuraci
# Loop infinito en otras configuraciones hasta que se pulse la de terminar
for (( ; ; ))
do
othopt=`dialog --stdout --nocancel --menu "$(T "Other configs")" 0 0 8 e "Nada mas / Finalizar instalacion" 1 "Cambiar hostname (Nombre pc)" 2 "Usar otra distribucion de teclado como principal" 3 "Cambiar contraseña de root" 4 "Habilitar AUR (con yaourt)"`
othopt=`dialog --stdout --nocancel --menu "$(T "Other configs")" 0 0 8 e "Nada mas / Finalizar instalacion" 1 "Cambiar hostname (Nombre pc)" 2 "Usar otra distribucion de teclado como principal" 3 "Habilitar AUR (con yaourt)"`
if [[ $othopt = "e" ]];then
break
else
@@ -672,19 +687,7 @@ do
#Cambiar el layout del teclado por el nuevo
keyboardlayout
;;
3)
until [[ $pass1 = $pass2 && $pass1 != "" ]]
do
pass1=`dialog --stdout --insecure --passwordbox "$(T "Password for ") . root" 9 50`
pass2=`dialog --stdout --insecure --passwordbox "$(T "Repeat password")" 9 50`
if ! [[ $pass1 = $pass2 && $pass1 != "" ]];then
mostrardialog "$(T "Password")" "$(T "Passwords do not match")"
fi
done
echo "root:${pass1}" | inchroot chpasswd
pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
;;
4) inchroot pacman -S yaourt base-devel --noconfirm --needed;;
3) inchroot pacman -S yaourt base-devel --noconfirm --needed;;
esac
fi
done

15
archinstall/translations.sh
View File

@@ -322,11 +322,26 @@ case "$1" in
"es") echo "No, editar";;
*) echo "$1";;
esac;;
"Edit")
case $sclang in
"es") echo "Editar";;
*) echo "$1";;
esac;;
"Same as user")
case $sclang in
"es") echo "La misma";;
*) echo "$1";;
esac;;
"It's right")
case $sclang in
"es") echo "Es correcto";;
*) echo "$1";;
esac;;
"You want to edit root (admin) password or set same as user?")
case $sclang in
"es") echo "¿Quieres editar la contraseña para root (administrador) o usar la misma que el usuario?";;
*) echo "$1";;
esac;;
*) echo "$1";;
esac
}