Commits:
---------- Forwarded message ----------
From: <music-owner@xxxxxxxxxxxxxxxxxxxxxxx>
Date: 27 October 2012 12:31
Subject: 4 commits - fedora-jam-kde-theme/src spin-kickstarts/fedora-jam
To: imalone@xxxxxxxxxxxxxxxxx
You are not allowed to post to this mailing list, and your message has
been automatically rejected. If you think that your messages are
being rejected in error, contact the mailing list owner at
music-owner@xxxxxxxxxxxxxxxxxxxxxxx.
---------- Forwarded message ----------
From: Ian Malone <imalone@xxxxxxxxxxxxxxxxx>
To: music@xxxxxxxxxxxxxxxxxxxxxxx
Cc:
Date: Sat, 27 Oct 2012 11:31:56 +0000 (UTC)
Subject: 4 commits - fedora-jam-kde-theme/src spin-kickstarts/fedora-jam
fedora-jam-kde-theme/src/desktoptheme/Fedora_Jam/metadata.desktop | 2
spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks |
36 +++++-----
2 files changed, 22 insertions(+), 16 deletions(-)
New commits:
commit 8253452614df3561502bcd3858fdbaf36444c01f
Author: Ian Malone <ibmalone@xxxxxxxxx>
Date: Sat Oct 20 02:15:05 2012 +0100
Fix mistakes in sed line.
diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
index be04421..b400286 100644
--- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
+++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
@@ -196,7 +196,7 @@ FavoriteURLs=$JAMFAVORITES
EOF
# Override fedora-live-kde-base.ks settings
-sed /etc/rc.d/init.d/livesys -ires"#^(FavoriteURLs=)=.*#\1${JAMFAVORITES}#"
+sed -i /etc/rc.d/init.d/livesys -res"#^(FavoriteURLs=).*#\1${JAMFAVORITES}#"
# Set default theme (to be changed to a customized one)
cat >> /etc/skel/.kde/share/config/plasmarc << EOF
commit 50098b04be904948e85af376a56d527f29e2c190
Author: Ian Malone <ibmalone@xxxxxxxxx>
Date: Fri Oct 19 23:49:02 2012 +0100
Fix typo
diff --git a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
index 5fe1696..be04421 100644
--- a/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
+++ b/spin-kickstarts/fedora-jam/fedora-live-jam-kde.ks
@@ -196,7 +196,7 @@ FavoriteURLs=$JAMFAVORITES
EOF
# Override fedora-live-kde-base.ks settings
-sed /etc/rc.d/init.d/livesys -ires"#^(FavoriteURLs=)=.*#\1${JAMFAVORITES}#'
+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
commit f1f12a28533f4fc10b316c88111ce2fa907ccadd
Author: Ian Malone <ibmalone@xxxxxxxxx>
Date: Fri Oct 19 21:07:45 2012 +0100
Jam theme based on oxygen.
diff --git a/fedora-jam-kde-theme/src/desktoptheme/Fedora_Jam/metadata.desktop
b/fedora-jam-kde-theme/src/desktoptheme/Fedora_Jam/metadata.desktop
index a6685fb..367050c 100644
--- a/fedora-jam-kde-theme/src/desktoptheme/Fedora_Jam/metadata.desktop
+++ b/fedora-jam-kde-theme/src/desktoptheme/Fedora_Jam/metadata.desktop
@@ -13,7 +13,7 @@ X-KDE-PluginInfo-License=CC-BY-SA
X-KDE-PluginInfo-EnabledByDefault=true
[Settings]
-FallbackTheme=default
+FallbackTheme=oxygen
[Wallpaper]
defaultWallpaperTheme=Fedora_Jam
commit 1bd69de88f3d93fa16ff8a32031a6257df58f4be
Author: Ian Malone <ibmalone@xxxxxxxxx>
Date: Fri Oct 19 21:02:25 2012 +0100
Kickstart spin theme tweaking.
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
--
imalone
http://ibmalone.blogspot.co.uk
_______________________________________________
music mailing list
music@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/music
