From b8af08c38d53be4cccf4790275c31d131ad4607b Mon Sep 17 00:00:00 2001
From: JKANetwork <contacto@jkanetwork.com>
Date: Tue, 17 Jan 2017 20:32:55 +0100
Subject: [PATCH] First try of real printer support

---
 ISOCreateScripts/depsjkarch.sh |  2 +-
 archinstall/archinstall-dev.sh | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ISOCreateScripts/depsjkarch.sh b/ISOCreateScripts/depsjkarch.sh
index ab1bde1..8c3a917 100755
--- a/ISOCreateScripts/depsjkarch.sh
+++ b/ISOCreateScripts/depsjkarch.sh
@@ -24,7 +24,7 @@ vlc qt4 smplayer totem clementine \
 gimp inkscape pinta krita \
 noto-fonts noto-fonts-cjk noto-fonts-emoji ttf-dejavu ttf-liberation ttf-ms-fonts ttf-google-fonts-git \
 evince ristretto librsvg gnome-calculator gnome-disk-utility file-roller lrzip p7zip unace unrar tumbler poppler-glib ffmpegthumbnailer libgsf \
-cups cups-filters hplip bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry \
+cups cups-filters cups-pk-helper system-config-printer hplip bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry \
 dropbox megasync geary k3b jre8-openjdk wine-staging wine_gecko winetricks lib32-libpng lib32-libldap lib32-gnutls lib32-mpg123 lib32-libpulse lib32-ncurses lib32-openal lib32-alsa-lib lib32-gst-plugins-base-libs bleachbit \
 sublime-text-dev sublime-text visual-studio-code jdk8-openjdk eclipse-java monodevelop brackets atom-editor-bin gdevelop poedit arduino \
 xorg-server xorg-xinit xorg-server-common xf86-input-libinput xterm lightdm lightdm-gtk-greeter gvfs gvfs-mtp gvfs-afc gvfs-smb udisks networkmanager network-manager-applet gnome-keyring xdialog \
diff --git a/archinstall/archinstall-dev.sh b/archinstall/archinstall-dev.sh
index 111fcf6..4020b05 100755
--- a/archinstall/archinstall-dev.sh
+++ b/archinstall/archinstall-dev.sh
@@ -479,8 +479,10 @@ function programasguiuser {
 			*6*)	packages="$packages tumbler poppler-glib ffmpegthumbnailer libgsf";;&
 		esac
 		case $opt7 in
-			*1*)	packages="$packages cups cups-filters";;&
-			*2*)	packages="$packages hplip";;&
+			*1*)	cups=1;;&
+			*2*)	packages="$packages hplip"
+					cups=1
+					;;&
 			*3*)	packages="$packages bluez bluez-utils bluez-cups bluez-firmware bluez-libs blueberry";;&
 		esac
 		case $opt8 in
@@ -512,6 +514,10 @@ function programasguiuser {
 		esac
 		allpackages=$allpackages" "$packages
 		packages=""
+		#Añadir soporte cups basico si se selecciona cualquier opcion de impresoras
+		if [[ $cups = "1" ]];then
+			allpackages=$allpackages" cups cups-filters cups-pk-helper system-config-printer"
+		fi
 	fi
 }
 
@@ -717,6 +723,11 @@ function installconf {
 	execl chroot systemctl enable lightdm
 	execl chroot systemctl enable NetworkManager
 	execl chroot systemctl enable dhcpcd
+	
+	# Enable cupsd service for printing
+	if [[ $cups = "1" ]];then
+		execl chroot systemctl enable org.cups.cupsd
+	fi
 
 
 	# Configure wine if neccesary