Updated installer and scripts

ISOCreateScripts/totalisocreate.sh

@@ -29,11 +29,11 @@ function modifyimage {
 
 	
 	#Delete packages not needed from official iso
-	sudo arch-chroot $sfslocate/ /usr/bin/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 --noconfirm
+	sudo arch-chroot $sfslocate/ /usr/bin/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 openconnect pcsclite python2 python reflector --noconfirm
 	#Restore bash shell (not zsh)
 	sudo arch-chroot $sfslocate/ /usr/bin/chsh -s /bin/bash root
 	#Install new
-	sudo arch-chroot $sfslocate/ /usr/bin/pacman -Su gparted xf86-video-vesa xorg-xinit lwm localepurge --noconfirm --ignore linux #Do not upgrade kernel automatically
+	sudo arch-chroot $sfslocate/ /usr/bin/pacman -Su gparted xf86-video-vesa xorg-xinit lwm xorg-xrandr xterm localepurge --noconfirm --ignore linux #Do not upgrade kernel automatically
 	#For gparted to work
 	sudo rm $sfslocate/etc/X11/xinit/xinitrc
 	sudo touch $sfslocate/etc/X11/xinit/xinitrc
@@ -80,13 +80,8 @@ function bashprofile {
 	sudo echo "#" > $sfslocate/root/.bash_profile
 	sudo echo "# ~/.bash_profile" >> $sfslocate/root/.bash_profile
 	sudo echo "#" >> $sfslocate/root/.bash_profile
-	if [[ $1 = "Online" ]];then
-		sudo echo "cd /root/" >> $sfslocate/root/.bash_profile
-		sudo echo "./downloadinstall.sh" >> $sfslocate/root/.bash_profile
-	else #Offline
-		sudo echo "cd /root/offlinefiles/" >> $sfslocate/root/.bash_profile
-		sudo echo "./selectlang.sh" >> $sfslocate/root/.bash_profile
-	fi
+	sudo echo "cd /root/" >> $sfslocate/root/.bash_profile
+	sudo echo "./downloadinstall.sh" >> $sfslocate/root/.bash_profile
 	sudo echo "[[ -f ~/.bashrc ]] && . ~/.bashrc" >> $sfslocate/root/.bash_profile
 }
 
@@ -103,70 +98,6 @@ function prepareISOFolder {
 	cp temp/airootfs.sfs iso/arch/x86_64/airootfs.sfs
 }
 
-##Function online iso create
-function createOnline {
-	#							Online ISO Procedure
-	#Copy important files
-	prepareISOFolder
-
-	sudo unsquashfs -d $sfslocate/ iso/arch/x86_64/airootfs.sfs
-
-	#Permisos de root de la imagen cambiar temporalmente
-	sudo chmod 777 $sfslocate/root/
-	sudo rm $sfslocate/root/*
-
-	#.bash_profile Online
-	bashprofile "Online"
-
-	#Copiar fichero instalador
-	sudo cp ../archinstall/downloadinstall.sh $sfslocate/root/
-
-	#Resto de modificaciones (las comunes) y cerrado del sfs 
-	modifyimage
-
-	#Creamos la ISO 
-	mkisofs -b isolinux/isolinux.bin -r -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "JKARCH-ISO" -o JKArch-Online-$yearmonth.iso iso/
-	sudo rm -rf iso/
-	echo "ISO Online creada"
-}
-
-function createOffline {
-	#							Offline ISO Procedure
-	#Copy important files
-	prepareISOFolder
-
-	#Unsquash sfs file
-	sudo unsquashfs -d $sfslocate/ iso/arch/x86_64/airootfs.sfs
-
-	#Permisos de root de la imagen cambiar temporalmente
-	sudo chmod 777 $sfslocate/root/
-	sudo rm $sfslocate/root/*
-
-	#.bash_profile Offline
-	bashprofile "Offline"
-
-	#Create subfolder and folder at same time
-	sudo mkdir -p $sfslocate/root/offlinefiles/mods/
-	#Esta ruta es absoluta, no vale para todos los sistemas (Es "temporal")
-	sudo cp ../archinstall/* $sfslocate/root/offlinefiles/
-	sudo rm $sfslocate/root/offlinefiles/downloadinstall.sh $sfslocate/root/offlinefiles/archinstall-dev.sh
-	sudo cp ../mods/* $sfslocate/root/offlinefiles/mods/
-
-	#Resto de modificaciones (las comunes) y cerrado del sfs 
-	modifyimage
-
-	#Creamos el repositorio
-	sudo sh depsjkarch.sh
-	#Lo movemos a su sitio
-	mkdir -p iso/repo/
-	mv repoofflinejkarch/* iso/repo/
-	rm -rf repoofflinejkarch/
-
-	#Creamos la ISO 
-	mkisofs -b isolinux/isolinux.bin -r -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "JKARCH-ISO" -o JKArch-Offline-$yearmonth.iso iso/
-	sudo rm -rf iso/
-	echo "ISO Offline creada"
-}
 
 #Date for builds
 today=$(date +%y%m%d)
@@ -193,13 +124,28 @@ if [[ $today != $lastdownload ]];then #Only download one time at day
 fi
 
 
-#Switch del argumento $1 para ver si solo se quiere crear una de las dos imagenes iso
-case $1 in
-	"Online") createOnline;;
-	"Offline") createOffline;;
-	"")
-		createOnline
-		createOffline
-		;;
-esac
+#							Create ISO Procedure
+#Copy important files
+prepareISOFolder
+
+sudo unsquashfs -d $sfslocate/ iso/arch/x86_64/airootfs.sfs
+
+#Permisos de root de la imagen cambiar temporalmente
+sudo chmod 777 $sfslocate/root/
+sudo rm $sfslocate/root/*
+
+#.bash_profile
+bashprofile
+
+#Copiar fichero instalador
+sudo cp ../archinstall/downloadinstall.sh $sfslocate/root/
+
+#Resto de modificaciones (las comunes) y cerrado del sfs 
+modifyimage
+
+#Creamos la ISO 
+mkisofs -b isolinux/isolinux.bin -r -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -V "JKARCH-ISO" -o JKArch-Online-$yearmonth.iso iso/
+sudo rm -rf iso/
+echo "ISO creado"
+	
 echo "Script terminado"