1
0
mirror of https://gitlab.com/JKANetwork/JKArch.git synced 2026-02-16 02:01:32 +01:00

Restructure

This commit is contained in:
kprkpr
2016-09-27 23:39:03 +02:00
parent ddb4ab5603
commit df202e043c
3 changed files with 360 additions and 1219 deletions

379
archinstall/archinstall.sh Executable file → Normal file
View File

@@ -41,6 +41,19 @@ fatalerror "$(T "Network connection error, please check it")"
fi
}
function inchroot {
chroot /mnt /bin/bash -c "$*"
}
function optstate {
if [[ $1 =~ "$2" ]];then
echo "on"
else
echo "off"
fi
}
function particiones {
clear
mostrardialog "$(T "Questions about partitions where system will be installed")" "$(T "Questions about partitions dialog. Text")"
@@ -113,8 +126,9 @@ case $optpa in
fi
break;;
*)
mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, se apagara el ordenador"
poweroff;;
mostrardialog "Instalacion detenida" "Se detuvo la instalacion. No se hicieron cambios. Al aceptar, reiniciara la instalacion"
exec ./selectlang.sh
;;
esac
fi;;
esac
@@ -253,7 +267,8 @@ fi
#fin del if de pedir los datos si no esta en automatico
}
function install {
### Base install of the system ###
function baseinstall {
clear
tput setaf 2 ; echo "$(T "Installing system, this can take about 10 minutes, wait")" ; tput setaf 9
sleep 2
@@ -281,14 +296,13 @@ if [[ $isoffline = "0" ]];then
fi
if [[ $isoffline = "1" ]];then
tput setaf 2 ; echo "$(T "Installing packages")..." ; tput setaf 9
pacstrap -C /root/offlinefiles/pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist
mv pacman.conf /mnt/etc/pacman.conf.post #Move pacman.conf ("original online") to a chroot location
pacstrap -C pacman-offline.conf /mnt/ base btrfs-progs jkarch-mirrorlist
mv pacman-offline.conf /mnt/etc/pacman.conf #Move pacman.conf (offline) to pacman chroot location
fi
inchroot pacman -Syu jka-toolkit git wget netctl iw wpa_supplicant dialog sudo alsa-utils dosfstools ntfs-3g bash-completion --noconfirm --needed
#Create fstab
genfstab -U /mnt >> /mnt/etc/fstab
genfstab -U /mnt > /mnt/etc/fstab
#Create or activate swap if neccesary
if [[ $swaptype ]];then
case $swaptype in
@@ -302,27 +316,331 @@ if [[ $swaptype ]];then
esac
fi
mkdir -p /mnt/root/inst/
if [[ $isoffline = 0 ]];then
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/archinstall/chrootinstall.sh -O /mnt/root/inst/chrootinstall.sh
isanetworkerror
cp -r /etc/netctl/* /mnt/etc/netctl/
cp -f /etc/resolv.conf /mnt/etc/resolv.conf
else # Its offline
mv chrootinstall.sh /mnt/root/inst/chrootinstall.sh
cp -r /root/offlinefiles/ /mnt/run/archiso/ # Copy offline files
fi
chmod +x /mnt/root/inst/chrootinstall.sh
cp translations.sh /mnt/root/inst/translations.sh
mount --bind /sys /mnt/sys
mount --bind /proc /mnt/proc
mount --bind /dev /mnt/dev
mount --bind /run /mnt/run
if [[ $isoffline = 1 ]];then
mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/
mount --bind /run/archiso/bootmnt/ /mnt/run/archiso/bootmnt/ # CD bind
fi
chroot /mnt /bin/bash -c "./root/inst/chrootinstall.sh $sclang $particionraiz $partefi"
}
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)
for addr in $(echo $langs | tr " " "\n")
do
varx+=" $addr $addr"
done
varf="dialog --stdout --nocancel --menu \"$(T "Select language for JKArch")\" 0 0 5 $varx"
opclang=`bash -c "$varf"`
varx="" #Empty varx
langabr=$(echo $opclang | cut -f1 -d"_")
langinst=$(cat /mnt/etc/locale.gen | grep -m1 '^#'$opclang | cut -c2-40)
opt=`dialog --stdout --nocancel --menu "$(T "Your language:") $opclang" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"`
case $opt in
2) opclang="";;
esac
done #End of selecting lang
sed -i "s/\#$langinst/$langinst/g" /mnt/etc/locale.gen
echo "LANG=$opclang" > /mnt/etc/locale.conf
echo "LANGUAGE=$opclang" >> /mnt/etc/locale.conf
echo "LC_COLLATE=$opclang" >> /mnt/etc/locale.conf
echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
inchroot locale-gen
clear
echo "$(T "Now select your timezone for adjusting the clock")"
while [[ $NEW_TIMEZONE == "" ]];do
NEW_TIMEZONE=$(inchroot tzselect)
opt=`dialog --stdout --nocancel --menu "$(T "Your timezone:") $NEW_TIMEZONE" 0 0 4 1 "$(T "It's right")" 2 "$(T "No,edit")"`
case $opt in
2) NEW_TIMEZONE="";;
esac
done
test -n "$NEW_TIMEZONE" && cp -fp /mnt/usr/share/zoneinfo/"$NEW_TIMEZONE" /mnt/etc/localtime
inchroot hwclock --systohc --utc
echo "$(T "Syncing hour to internet")";
inchroot pacman -S ntp --noconfirm
inchroot systemctl enable ntpd
if [[ $isoffline = 0 ]];then #Only sync if its online
inchroot ntpd -qg
inchroot hwclock -w
else
echo "Clock will not be okay until restart and configure manually because you dont have net"
fi
}
function userpass {
if [[ $isoffline = 1 ]];then # Is an offline installation?
tar xJf mods/skel.tar.gz -C /mnt/
else #online
wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/mods/skel.tar.gz -O- | tar xJf - -C /mnt/
fi
clear
#Aqui hay que añadir los comandos para crear un usuario, aunque esto correrá dentro del chroot y no aqui
nameuser=`dialog --stdout --inputbox "Ahora crearemos tu usuario \nNombre para tu usuario:" 10 50`
inchroot useradd -m -G wheel -s /bin/bash $nameuser
until [[ $pass1 = $pass2 && $pass1 != "" ]]
do
pass1=`dialog --stdout --insecure --passwordbox "$(T "Password for ") . $nameuser" 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 "${nameuser}:${pass1}" | inchroot chpasswd
pass1="" #Reiniciar pass1, por si hace falta de nuevo que el until funcione
#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
if [[ $optentorno != "6" ]];then
inchroot gconftool-2 --set /apps/gksu/sudo-mode --type=bool true --owner=$(echo $nameuser)
fi
}
function graficos {
optgrafica=`dialog --stdout --nocancel --scrollbar --menu "$(T "What is your graphics card brand?")" 0 0 6 1 "Nvidia" 2 "AMD/ATI" 3 "Intel" 4 "VIA" 5 "Estoy usando VirtualBox" 6 "Estoy usando VMWare" 7 "No se la marca/Otra (Se instalaran todos los drivers graficos estandar)"`
case $optgrafica in
1) inchroot pacman -S xf86-video-nouveau xf86-video-nv libva-vdpau-driver mesa-vdpau --noconfirm;;
2) inchroot pacman -S xf86-video-ati xf86-video-amdgpu libva-mesa-driver libva-vdpau-driver mesa-vdpau --noconfirm;;
3) inchroot pacman -S xf86-video-intel libva-intel-driver libvdpau-va-gl --noconfirm;;
4) inchroot pacman -S xf86-video-openchrome --noconfirm;;
5) inchroot pacman -S virtualbox-guest-utils virtualbox-guest-modules-arch --noconfirm;;
6) inchroot pacman -S xf86-video-vmware xf86-input-vmmouse open-vm-tools --noconfirm;;
7) inchroot pacman -S $(inchroot pacman -Ssq xf86-video-*) --noconfirm;;
esac
#Instalar siempre la estandar, por se acaso
inchroot pacman -S xf86-video-vesa mesa-libgl --noconfirm
}
function programasguiuser {
clear
#Seleccion de programas predeterminados
opt1="1 6"
opt2="1 5"
opt3="1"
opt5="1"
opt6="1 2"
mostrardialog "Leer" "Ahora se le presenta la opcion de elegir que programas quieres que sean instalados, cosa que recomendamos, aunque, dejamos tambien una opcion rapida, que instalara lo basico y recomendado desde nuestro punto de vista."
tipoinstall=`dialog --stdout --nocancel --menu "¿Elegir los programas que quiere?" 0 0 5 1 "Si, elegir (Muy recomendado)" 2 "No, opcion rapida (No recomendado)"`
case $tipoinstall in
1)
until [[ $surep -eq 1 ]]
do
optprogramas=`dialog --stdout --nocancel --scrollbar --menu "Categorías" 0 0 9 1 "Navegadores web ($(echo $opt1 | wc -w) seleccionados)" 2 "Editores de texto y Office ($(echo $opt2 | wc -w) seleccionados)" 3 "Audio y Video ($(echo $opt3 | wc -w) seleccionados)" 4 "Imagen ($(echo $opt4 | wc -w) seleccionado)" 5 "Fuentes/Tipos de letra ($(echo $opt5 | wc -w) seleccionado)" 6 "Visores ($(echo $opt6 | wc -w) seleccionado)" 7 "Soportes (Impresoras,Bluetooth...) ($(echo $opt7 | wc -w) seleccionado)" 8 "Utilidades varias ($(echo $opt8 | wc -w) seleccionado)" I "Instalar"`
#Menu con cada una de las categorias
case $optprogramas in
# La variable optstate "$optX" Y es una funcion que devuelve on o off, para mostrar la ultima seleccion bien
1) opt1=`dialog --stdout --checklist "Navegadores web" 0 0 6 1 "Firefox" $(optstate "$opt1" 1) 2 "Chrome" $(optstate "$opt1" 2) 3 "Chromium" $(optstate "$opt1" 3) 4 "Opera" $(optstate "$opt1" 4) 5 "Otter Browser" $(optstate "$opt1" 5) 6 "Soporte Flash Player" $(optstate "$opt1" 6)`;;
2) opt2=`dialog --stdout --scrollbar --checklist "Editores de texto y Office" 0 0 7 1 "Libreoffice (Recomendado)" $(optstate "$opt2" 1) 2 "AbiWord" $(optstate "$opt2" 2) 3 "Gnumeric" $(optstate "$opt2" 3) 4 "WPS Office" $(optstate "$opt2" 4) 5 "leafpad (Bloc de notas)" $(optstate "$opt2" 5) 6 "gedit" $(optstate "$opt2" 6) 7 "notepadqq" $(optstate "$opt2" 7)`;;
3) opt3=`dialog --stdout --checklist "Audio y Video" 0 0 6 1 "VLC (Recomendado)" $(optstate "$opt3" 1) 2 "SMPlayer" $(optstate "$opt3" 2) 3 "Totem" $(optstate "$opt3" 3) 4 "Clementine" $(optstate "$opt3" 4) 5 "Banshee" $(optstate "$opt3" 5)`;;
4) opt4=`dialog --stdout --checklist "Imagen" 0 0 6 1 "GIMP" $(optstate "$opt4" 1) 2 "Inkscape" $(optstate "$opt4" 2) 3 "Pinta" $(optstate "$opt4" 3) 4 "Krita (Dibujo)" $(optstate "$opt4" 4)`;;
5) opt5=`dialog --stdout --checklist "Fuentes/Tipos de letra" 0 0 6 1 "noto-fonts (Muy recomendado)" $(optstate "$opt5" 1) 2 "Microsoft Fonts" $(optstate "$opt5" 2) 3 "Recopilatorio de fuentes de Google (mas de 300)" $(optstate "$opt5" 3)`;;
6) opt6=`dialog --stdout --checklist "Recomendado pulsar todos \nVisores" 0 0 6 1 "Evince (PDF)" $(optstate "$opt6" 1) 2 "Ristretto (imagenes como jpg,png...)" $(optstate "$opt6" 2)`;;
7) opt7=`dialog --stdout --checklist "Soportes (Impresoras,Bluetooth...)" 0 0 6 1 "CUPS (Soporte impresoras)" $(optstate "$opt7" 1) 2 "HPLIP (Soporte impresoras HP)" $(optstate "$opt7" 2) 3 "Bluetooth" $(optstate "$opt7" 3)`;;
8) opt8=`dialog --stdout --scrollbar --checklist "Utilidades varias" 0 0 8 1 "Dropbox" $(optstate "$opt8" 1) 2 "MEGA" $(optstate "$opt8" 2) 3 "Visor de correo Evolution" $(optstate "$opt8" 3) 4 "Grabador de discos (k3b)" $(optstate "$opt8" 4) 5 "Java (jre8)" $(optstate "$opt8" 5) 6 "Wine ('Emulador' de programas de Windows)" $(optstate "$opt8" 6) 7 "BleachBit (Limpiador de disco duro)" $(optstate "$opt8" 7)`;;
9) opt9=`dialog --stdout --scrollbar --checklist "Programacion" 0 0 8 1 "Sublime Text 3" $(optstate "$opt9" 1) 2 "Sublime Text 2" $(optstate "$opt9" 2) 3 "Visual Studio Code" $(optstate "$opt9" 3) 4 "Eclipse" $(optstate "$opt9" 4) 5 "Monodevelop" $(optstate "$opt9" 5) 6 "Brackets" $(optstate "$opt9" 6) 7 "Atom" $(optstate "$opt9" 7) 8 "Gamedevelop" $(optstate "$opt9" 8) 9 "Poedit (gettext)" $(optstate "$opt9" 9) A "Arduino IDE" $(optstate "$opt9" A)`;;
"I")
#Instalar
surep=1
break;;
esac
done
;;
2) mostrardialog "Programas predeterminados" "Ahora se van a instalar los programas predeterminados, espere"
esac
packages="" #Erase var before
case $opt1 in
*1*) packages="firefox";;&
*2*) packages="$packages google-chrome";;&
*3*) packages="$packages chromium";;&
*4*) packages="$packages opera";;&
*5*) packages="$packages otter-browser";;&
*6*) packages="$packages flashplugin";;&
esac
case $opt2 in
*1*) packages="$packages libreoffice-fresh";;&
*2*) packages="$packages abiword";;&
*3*) packages="$packages gnumeric";;&
*4*) packages="$packages wps-office";;&
*5*) packages="$packages leafpad";;&
*6*) packages="$packages gedit";;&
*7*) packages="$packages notepadqq";;&
esac
case $opt3 in
*1*) packages="$packages vlc qt4";;&
*2*) packages="$packages smplayer";;&
*3*) packages="$packages totem";;&
*4*) packages="$packages clementine";;&
*5*) packages="$packages banshee";;&
esac
case $opt4 in
*1*) packages="$packages gimp";;&
*2*) packages="$packages inkscape";;&
*3*) packages="$packages pinta";;&
*4*) packages="$packages krita";;&
esac
case $opt5 in
*1*) packages="$packages noto-fonts";;&
*2*) packages="$packages ttf-ms-fonts";;&
*3*) packages="$packages ttf-google-fonts-git";;&
esac
case $opt6 in
*1*) packages="$packages evince";;&
*2*) packages="$packages ristretto librsvg";;&
esac
case $opt7 in
*1*) packages="$packages cups cups-filters";;&
*2*) packages="$packages hplip";;&
*3*) packages="$packages bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry";;&
esac
case $opt8 in
*1*) packages="$packages dropbox";;&
*2*) packages="$packages megasync";;&
*3*) packages="$packages geary";;&
*4*) packages="$packages k3b";;&
*5*) packages="$packages jre8-openjdk";;&
*6*) packages="$packages wine-staging wine_gecko winetricks"
packages="$packages lib32-libpng lib32-libldap lib32-gnutls lib32-mpg123 lib32-libpulse lib32-ncurses lib32-openal lib32-alsa-lib" #Some 32bit libs for winearch 32 work better
inswine=1;;&
*7*) packages="$packages bleachbit";;&
esac
case $opt9 in
*1*) packages="$packages sublime-text-dev";;&
*2*) packages="$packages sublime-text";;&
*3*) packages="$packages visual-studio-code";;&
*4*) packages="$packages jdk8-openjdk eclipse-java";;&
*5*) packages="$packages monodevelop";;&
*6*) packages="$packages brackets";;&
*7*) packages="$packages atom-editor-bin";;&
*8*) packages="$packages gdevelop";;&
*9*) packages="$packages poedit";;&
*A*) packages="$packages arduino";;&
esac
inchroot pacman -S $packages --noconfirm --needed
if [[ $inswine = 1 ]];then
echo "$(T "Configuring wine for better experience") (32 bit winearch)"
inchroot su $nameuser -c "WINEARCH=win32 wineboot -u"
fi
packages=""
}
function baseconX {
tput setaf 2 ;echo "$(T "Installing desktop and basic programs, please wait")" ; tput setaf 9
sleep 2
inchroot pacman -S xorg-server xorg-xinit xorg-server-common xf86-input-libinput lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-smb udisks networkmanager network-manager-applet gnome-keyring xdialog --noconfirm
inchroot pacman -S lxterminal ttf-inconsolata file-roller --noconfirm
#Instalar pulseaudio si tiene entorno grafico, sino es tonteria
inchroot pacman -S pulseaudio pavucontrol --noconfirm
echo "Instalando octopi, gestor visual de actualizaciones y paquetes"
inchroot pacman -S octopi octopi-notifier gksu --noconfirm
inchroot pacman -S xdg-user-dirs --noconfirm
inchroot xdg-user-dirs-update
#Gestor de energia
inchroot pacman -S xfce4-power-manager --noconfirm
#Habilitamos ciertos servicios
inchroot systemctl enable lightdm
inchroot systemctl enable NetworkManager
#Parte visual
inchroot pacman -S jkarch-appearance --noconfirm
clear
}
function keyboardlayout {
echo "KEYMAP=$langabr" > /mnt/etc/vconsole.conf
echo "# Read and parsed by systemd-localed. It's probably wise not to edit this file" > /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo "# manually too freely." >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo 'Section "InputClass"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo ' Identifier "system-keyboard"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo ' MatchIsKeyboard "on"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo ' Option "XkbLayout" "'$langabr'"' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
echo 'EndSection' >> /mnt/etc/X11/xorg.conf.d/00-keyboard.conf
}
function entorno {
clear
optentorno=`dialog --stdout --nocancel --menu "$(T "Select your desktop enviroment")" 0 0 5 1 "LXDE (Muy ligero)" 2 "XFCE (Ligero)" 3 "Cinnamon (Facil para antiguos usuarios de Windows)" 4 "Gnome (Complejo, pero practico)" 5 "MATE (Tradicional)" 6 "Plasma/KDE (Pesado aunque bonito) " 7 "No instalar entorno de escritorio"`
case $optentorno in
1)
baseconX
inchroot pacman -S lxappearance lxappearance-obconf lxde-common lxinput lxpanel lxrandr lxsession lxtask lxterminal openbox pcmanfm xfce4-notifyd --noconfirm
inchroot pacman -S gtk-engine-aurora faenza-icon-theme --noconfirm
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
;;
2)
baseconX
inchroot pacman -S xfce4 --noconfirm
inchroot pacman -S faenza-icon-theme --noconfirm
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
;;
3)
baseconX
inchroot pacman -S cinnamon --noconfirm
;;
4)
optgnome=`dialog --stdout --nocancel --menu "¿Gnome base o gnome con sus extras?" 0 0 5 1 "Gnome base" 2 "Gnome+extras"`
baseconX
case $optgnome in
1) inchroot pacman -S gnome --noconfirm;;
2) inchroot pacman -S gnome gnome-extra --noconfirm;;
esac
inchroot pacman -R gdm --noconfirm
;;
5)
optmate=`dialog --stdout --nocancel --menu "¿MATE base o MATE con sus extras?" 0 0 5 1 "MATE base" 2 "MATE+extras"`
baseconX
case $optmate in
1) inchroot pacman -S mate --noconfirm;;
2) inchroot pacman -S mate mate-extra --noconfirm;;
esac
;;
6)
baseconX
inchroot pacman -S plasma --noconfirm
inchroot pacman -R plasma-mediacenter ksshaskpass --noconfirm
;;
esac
if [[ $optentorno != "7" ]];then
graficos
#Poner el teclado bien en x11
keyboardlayout
#Aqui va la personalizacion de programas, ya que son graficos.
programasguiuser
fi
}
clear
mostrardialog "$(T "JKArch install script")" "$(T "Intro arch install script")"
mostrardialog "JKArch" "El script esta en estado beta y se esta actualizando casi constantemente. Puede haber fallos importantes. En caso de fallo, vuelva a probar en unas horas"
@@ -370,8 +688,31 @@ if [[ $partefi ]];then
fi
tput setaf 1 ; echo "$(T "If you agree with that, press enter. If not, turn off the computer")" ; tput setaf 9
pause
install
baseinstall
horaidioma #Configure hour/timezone
echo "JKArch" > /mnt/etc/hostname
#Configuraciones varias, en entorno se instala el entorno y programas del usuario
entorno
mkinitcpio -p linux #Hacemos el mkinitcpio después de tener instalados los gráficos
#Ahora, se crea el usuario y se añaden los ficheros de configuracion de skel
userpass
bootinstall
otrasconfig
echo "$(T "Last tweaks and cleaning")"
inchroot systemctl enable dhcpcd
inchroot pacman -Sc --noconfirm
echo "Sincronizando datos al disco duro, puede tardar unos segundos"
sync
if [[ $isoffline = 1 ]];then # Is an offline installation?
echo "Configurando pacman para usar servidores web en los siguientes arranques..."
mv pacman.conf /mnt/etc/pacman.conf #Put online pacman.conf
fi
clear
mostrardialog "$(T "End")" "$(T "Setup finished, press enter to reboot.")"
rm -rf /mnt/root/inst
reboot