From 1bd69de88f3d93fa16ff8a32031a6257df58f4be Mon Sep 17 00:00:00 2001
From: Ian Malone <ibmalone@gmail.com>
Date: Fri, 19 Oct 2012 21:02:25 +0100
Subject: [PATCH 1/4] Kickstart spin theme tweaking.

---
 spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks |   36 ++++++++++++---------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
index 41701c3..5fe1696 100644
--- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
+++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
@@ -22,6 +22,8 @@ part / --size 10000
 
 %packages
 
+#spin
+fedora-jam-kde-theme
 
 #alsa
 alsa-firmware
@@ -186,29 +188,35 @@ thunderbird
 #setup kickoff favorites
 /bin/mkdir -p /etc/skel/.kde/share/config
 
-/bin/echo [Favorites] >> /etc/skel/.kde/share/config/kickoffrc
+JAMFAVORITES=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/fedora-qjackctl.desktop,/usr/share/applications/fedora-lash-panel.desktop,/usr/share/applications/mscore.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop
 
-/bin/echo FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/fedora-qjackctl.desktop,/usr/share/applications/fedora-lash-panel.desktop,/usr/share/applications/mscore.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop >> /etc/skel/.kde/share/config/kickoffrc
-
-#set up favorites for the live user too
-/bin/mkdir -p /home/liveuser/.kde/share/config
-
-/bin/echo [Favorites] >> /home/liveuser/.kde/share/config/kickoffrc
+cat <<EOF  >> /etc/skel/.kde/share/config/kickoffrc
+[Favorites]
+FavoriteURLs=$JAMFAVORITES
+EOF
 
-/bin/echo FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/mozilla-thunderbird.desktop,/usr/share/applications/fedora-qjackctl.desktop,/usr/share/applications/fedora-lash-panel.desktop,/usr/share/applications/mscore.desktop,/usr/share/applications/kde4/dolphin.desktop,/usr/share/applications/kde4/systemsettings.desktop >> /home/liveuser/.kde/share/config/kickoffrc
+# Override fedora-live-kde-base.ks settings
+sed /etc/rc.d/init.d/livesys -ires"#^(FavoriteURLs=)=.*#\1${JAMFAVORITES}#'
 
 # Set default theme (to be changed to a customized one)
 cat >> /etc/skel/.kde/share/config/plasmarc << EOF
-[$Version]
+[\$Version]
 update_info=plasma_popupapplet_fix_groups.upd:PlasmaPopupAppletFixGroups2
 [Theme]
-name=oxygen
+name=Fedora_Jam
+[Theme-plasma-netbook]
+name=Fedora_Jam-netbook
 EOF
-                
-cp  /etc/skel/.kde/share/config/plasmarc /home/liveuser/.kde/share/config/                
 
+# Set default splash
+cat >> /etc/skel/.kde/share/config/ksplashrc << EOF
+[KSplash]
+Engine=KSplashX
+Theme=FedoraJam
+EOF
 
-#add user to jackuser gorup on boot
+
+#add user to jackuser group on boot
 
 /bin/sed -i '/self.admin.modifyGroup(wheelEnt)/a \            jackEnt = self.admin.lookupGroupByName("jackuser")\n            jackEnt.add(libuser.MEMBERNAME, username)\n            self.admin.modifyGroup(jackEnt)' /usr/share/firstboot/modules/create_user.py
 
@@ -219,8 +227,6 @@ cp  /etc/skel/.kde/share/config/plasmarc /home/liveuser/.kde/share/config/
 /bin/sed -i '/self.is_admin = gtk.CheckButton(_("Add to Administrators group"))/c \        self.is_admin = gtk.CheckButton(_("Add to Administrator and Audio groups"))' /usr/share/firstboot/modules/create_user.py
 
 
-
-
 cat >> /etc/rc.d/init.d/livesys << EOF
 /usr/sbin/usermod -a -G jackuser,audio liveuser
 EOF
-- 
1.7.7.6

