diff --git a/installer/installer.sh b/installer/installer.sh index d5e7784..24e3c3a 100755 --- a/installer/installer.sh +++ b/installer/installer.sh @@ -1,6 +1,48 @@ #!/bin/bash ## Note: Some text editors in some lines its wrong the "markup color" because much '"'($) things. +if [[ $1 != "prepared" ]];then + #Prepare system before install + mostrardialog "$(T "JKArch install script")" "Preparando el sistema para la instalacion" + + #Grow cowspace + sudo -S mount -o remount,size=700M /run/archiso/cowspace + + #Enable pacman + pacman-key --init + pacman-key --populate + + #Update keyring + sudo pacman -Sy archlinux-keyring --noconfirm + pacman -S reflector --noconfirm + sudo reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist + #Delete programs (For not updating it) + sudo pacman -R clonezilla darkhttpd diffutils grml-zsh-config irssi linux-atm lvm2 man-db man-pages mc ndisc6 nmap smartmontools testdisk vi vim vim-runtime zsh openconnect pcsclite python2 python reflector --noconfirm + sudo rm -rf /var/cache/pacman/pkg/* + #Needed progs (gparted) + sudo pacman -S gparted xf86-video-vesa xorg-xinit lwm xrandr --noconfirm + sudo rm -rf /var/cache/pacman/pkg/* + #Update progs + sudo pacman -Su --noconfirm --ignore linux #Do not upgrade kernel automatically + sudo rm -rf /var/cache/pacman/pkg/* + + sudo rm /etc/X11/xinit/xinitrc + sudo touch /etc/X11/xinit/xinitrc + sudo chmod 777 /etc/X11/xinit/xinitrc + sudo echo "#Start gparted with startx command" > /etc/X11/xinit/xinitrc + sudo echo "lwm &" >> /etc/X11/xinit/xinitrc + sudo echo "xrandr -s 1024x768 -r 60 &" >> /etc/X11/xinit/xinitrc + sudo echo "xterm ./installer.sh prepared" >> /etc/x11/xinit/xinitrc + ##sudo echo "gparted &" >> /etc/X11/xinit/xinitrc + sudo chmod 644 /etc/X11/xinit/xinitrc + sudo rm -rf /var/cache/pacman/pkg/* + # System prepared, now start installer + startx + #Exit this. + exit +fi + + #First of all, the language idiom=`dialog --stdout --nocancel --backtitle "JKArch Instalation" --title "Language selection" --menu "Select your language / Selecciona tu idioma" 0 70 5 1 "Spanish (es)" 2 "English (en) (In progress)"` @@ -16,9 +58,9 @@ fi wget -nv https://gitlab.com/JKANetwork/JKArch/raw/master/installer/translations.sh -O translations.sh source translations.sh -#No black screensaver +# No black screensaver setterm -blank 0 -powerdown 0 -powersave off -#Fix para caracteres de dialog, ñ o tildes +# Fix for some chars export NCURSES_NO_UTF8_ACS=1 # Functions @@ -120,7 +162,7 @@ function particiones { 1) #Abrir gparted grafico mostrardialog "Gparted" "$(T "Gparted will be opened. Help text")" - startx;; + gparted;; 2) #Terminal echo $(T "Select hard disk to edit") @@ -625,38 +667,6 @@ function keyboardlayout { ##End of declaring functions, start of script -#Prepare system before install -mostrardialog "$(T "JKArch install script")" "Preparando el sistema para la instalacion" - -#Grow cowspace -sudo -S mount -o remount,size=700M /run/archiso/cowspace - -#Enable pacman -pacman-key --init -pacman-key --populate - -#Update keyring -sudo pacman -Sy archlinux-keyring --noconfirm -pacman -S reflector --noconfirm -sudo reflector --verbose -l 6 --sort rate --save /etc/pacman.d/mirrorlist -#Delete programs (For not updating it) -sudo pacman -R clonezilla darkhttpd diffutils grml-zsh-config irssi linux-atm lvm2 man-db man-pages mc ndisc6 nmap smartmontools testdisk vi vim vim-runtime zsh openconnect pcsclite python2 python reflector --noconfirm -sudo rm -rf /var/cache/pacman/pkg/* -#Needed progs (gparted) -sudo pacman -S gparted xf86-video-vesa xorg-xinit lwm --noconfirm -sudo rm -rf /var/cache/pacman/pkg/* -#Update progs -sudo pacman -Su --noconfirm --ignore linux #Do not upgrade kernel automatically -sudo rm -rf /var/cache/pacman/pkg/* - -sudo rm /etc/X11/xinit/xinitrc -sudo touch /etc/X11/xinit/xinitrc -sudo chmod 777 /etc/X11/xinit/xinitrc -sudo echo "#Start gparted with startx command" > /etc/X11/xinit/xinitrc -sudo echo "lwm & gparted" >> /etc/X11/xinit/xinitrc -sudo chmod 644 /etc/X11/xinit/xinitrc -sudo rm -rf /var/cache/pacman/pkg/* - #Start install clear