From 713df84009224baf1cbcf95b49cf5b3fca1d3bae Mon Sep 17 00:00:00 2001
From: kprkpr <kevin01010@gmail.com>
Date: Thu, 2 Jun 2016 13:36:32 +0200
Subject: [PATCH] changes

---
 archinstall/chrootinstall.sh |  15 +++++++++------
 mods/usersskel.zip           | Bin 0 -> 716 bytes
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 mods/usersskel.zip

diff --git a/archinstall/chrootinstall.sh b/archinstall/chrootinstall.sh
index 107e70e..6671867 100755
--- a/archinstall/chrootinstall.sh
+++ b/archinstall/chrootinstall.sh
@@ -26,6 +26,7 @@ exit
 
 function downloadmods {
 wget https://gitlab.com/JKANetwork/JKArch/raw/master/mods/splashscreen.zip -O /root/inst/splashscreen.zip
+wget https://gitlab.com/JKANetwork/JKArch/raw/master/mods/usersskel.zip -O /root/inst/usersskel.zip
 }
 
 function horaidioma {
@@ -63,6 +64,7 @@ hwclock --systohc --utc
 
 
 function userpass {
+unzip -q /root/inst/usersskel.zip -d /
 clear
 #Aqui hay que añadir los comandos para crear un usuario, aunque esto correrá dentro del chroot y no aqui
 echo "Para seguridad, vamos a cambiar la contraseña de root"
@@ -206,13 +208,13 @@ case $tipoinstall in
 				packages="$packages jre8-openjdk";;&
 			*6*)
 				packages="$packages wine-staging wine_gecko winetricks"
-				#inswine=1
+				inswine=1
 				;;&
 		esac
 		pacman -S $packages --noconfirm
-		#if [[ $inswine = 1 ]];then
-		#	WINEARCH=win32 wineboot -u
-		#fi
+		if [[ $inswine = 1 ]];then
+			su $nameuser -c "WINEARCH=win32 wineboot -u"
+		fi
 		packages=""
 		##Fin de la personalizacion
 		;;
@@ -223,7 +225,7 @@ esac
 
 function baseconX {
 echo "Instalando algún otro programa básico para arrancar X y programas base de X.."
-pacman -S xorg-server xorg-xinit xorg-server-common xf86-input-libinput lightdm lightdm-gtk-greeter lxterminal gvfs udisks networkmanager network-manager-applet xdialog --noconfirm
+pacman -S xorg-server xorg-xinit xorg-server-common xf86-input-libinput lightdm lightdm-gtk-greeter lxterminal ttf-inconsolata gvfs udisks networkmanager network-manager-applet xdialog --noconfirm
 #Instalar pulseaudio si tiene entorno grafico, sino es tonteria
 pacman -S pulseaudio pavucontrol --noconfirm
 pacman -S xdg-user-dirs --noconfirm
@@ -253,7 +255,7 @@ case $optentorno in
 		baseconX
 		pacman -S lxde --noconfirm
 		#Quitar paquetes no necesarios para correr lxde
-		pacman -R lxmusic lxlauncher lxdm --noconfirm
+		pacman -R lxmusic lxlauncher lxdm xmms2 --noconfirm
 		instentorno=1
         ;;
     2)
@@ -294,6 +296,7 @@ idiomax11
 #Aqui va la personalizacion de programas, ya que son graficos.
 programasguiuser
 fi
+
 ##Otros programas, yaourt
 yaourtinst=`dialog --stdout --nocancel --menu "¿Quiere habilitar el soporte para paquetes no oficiales de AUR?" 0 0 5 1 "Si (instalar yaourt)" 2 "No"`
 case $yaourtinst in
diff --git a/mods/usersskel.zip b/mods/usersskel.zip
new file mode 100644
index 0000000000000000000000000000000000000000..d20df20bbc07bda45c9e782df0dd0562d5fbe151
GIT binary patch
literal 716
zcmWIWW@Zs#W&nbw%tIa^8U|Q^jMS23{Q$U%ZZs8~P!+}5sX1_E91LMOhdgEouVd3;
zWME(d8ZCgVOfM<1IHM@JHRzz%VF!V|=fiDgUve<yT&fVkS#iPHzpLu>vkko~IgiBN
z%$XARr)>J0X_*U-Hr}0CTlqdW?M8>vpR|{L-+EVSD3#xNw{T0V<dm$d>`|%N%G$T<
zuHStq^*-w8wYL*qB}lt3SaiVVU}#_JZkNcUjSVZ`CWuUY6LoX(>(4u0PgI%uZp+E1
z38g;g*RQq_YhBTO^={Q)%~MW1-xoFh&^#(*Xls{qe_q_DoEN^^vO||Gx#aRKd&7%t
z?e9Al?#ePrn{D_=Lu&f^8ZJwg>t_lx%{DeV8>H@7{C~o(hW%<GA5>yCS?*02krCDL
zyL@)P*>S%;4F@}9V+~H2`5iJ_JSmg$i^lDO<vE8%TKr~+9q_CdPn(?d>GGOXSBIIE
zd1fyq>M9b;U;9|5wwYMhx@>o;5AbGWvS-E>Nh;9z5@>kq2x5YwjEg}5EXv3r!N4H3
zZu<T`7a19TFP;mgp?qXhF(Ve)R3)gX;AloMdVR(skdY0_)_cK5L-`1!u_XqW(FzSq
s8a<JXh9(UZ8y5K<Is~%eLd;GO%>d;Gc(byBe8>!h!oXy<7>F4d06mBBYybcN

literal 0
HcmV?d00001