From dc221cc9d520245dc9fc471fbf522f8c3dccd8bd Mon Sep 17 00:00:00 2001
From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Wed, 20 Dec 2006 15:53:40 +0000
Subject: [PATCH] Added a create_handbook_icon function and rearranged some of
 the icon creation for the LiveCD.  This should resolve bug #143725 once a new
 release is made.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1198 d1e1f19c-881f-0410-ab34-b69fee027534
---
 ChangeLog                           |  6 ++++++
 targets/support/chroot-functions.sh | 14 +++++++++++++
 targets/support/livecdfs-update.sh  | 32 ++++++++++++++++-------------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0c9c9f21..41998e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  20 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh, targets/support/livecdfs-update.sh:
+  Added a create_handbook_icon function and rearranged some of the icon
+  creation for the LiveCD. This should resolve bug #143725 once a new release
+  is made.
+
   20 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:
   We now disable the RC_COLDPLUG in /etc/conf.d/rc so udev will not do
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 43ff0474..103e2b76 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -249,3 +249,17 @@ function copy_file() {
 		copy_symlink ${f}
 	fi
 }
+
+create_handbook_icon() {
+	# This function creates a local icon to the Gentoo Handbook
+	echo "[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Link
+URL=file:///mnt/cdrom/docs/handbook/html/index.html
+Terminal=false
+Name=Gentoo Linux Handbook
+GenericName=Gentoo Linux Handbook
+Comment=This is a link to the local copy of the Gentoo Linux Handbook.
+Icon=gedit-icon.png" > /usr/share/applications/gentoo-handbook.desktop
+}
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 633394a4..2e82ee74 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/livecdfs-update.sh,v 1.64 2006/10/02 20:41:54 wolf31o2 Exp $
 
-. /tmp/chroot-functions.sh
+source /tmp/chroot-functions.sh
 
 update_env_settings
 
@@ -316,7 +316,6 @@ case ${clst_livecd_type} in
 			fi
 		fi
 
-
 		# This gives us our list of system packages for the installer
 		mkdir -p /usr/livecd
 		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
@@ -337,18 +336,23 @@ case ${clst_livecd_type} in
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
-		# Create our installer icons
-		if [ -e /usr/share/applications/installer-gtk.desktop ]
+		# Create our Handbook icon
+		create_handbook_icon
+
+		# Copy our icons into place and build home directories
+		if [ -n "${clst_livecd_users}" ]
 		then
-			if [ -n "${clst_livecd_users}" ]
-			then
-				for username in ${clst_livecd_users}
-				do
-					mkdir -p /home/${username}/Desktop
+			for username in ${clst_livecd_users}
+			do
+				mkdir -p /home/${username}/Desktop
+				# Copy our Handbook icon
+				cp -f /usr/share/applications/gentoo-handbook.desktop \
+					/home/${username}/Desktop
+				# Copy our installer icons
+				if [ -e /usr/share/applications/installer-gtk.desktop ]
+				then
 					cp -f /usr/share/applications/installer-gtk.desktop \
 						/home/${username}/Desktop
-					cp -f /usr/share/applications/installer-faq.desktop \
-						/home/${username}/Desktop
 					cp -f /usr/share/applications/installer-dialog.desktop \
 						/home/${username}/Desktop
 					sed -i -e \
@@ -356,9 +360,9 @@ case ${clst_livecd_type} in
 						/home/${username}/Desktop/installer-dialog.desktop
 					sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
 						/home/${username}/Desktop/installer-gtk.desktop
-					chown -R ${username}:100 /home/${username}
-				done
-			fi
+				fi
+				chown -R ${username}:100 /home/${username}
+			done
 		fi
 		;;
 	generic-livecd )
-- 
2.26.2