public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Ben Kohler <bkohler@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 07/10] livecdfs-update.sh: replace local handbook with wiki handbook
Date: Wed, 29 Mar 2023 14:30:57 -0500	[thread overview]
Message-ID: <20230329193100.2976079-7-bkohler@gentoo.org> (raw)
In-Reply-To: <20230329193100.2976079-1-bkohler@gentoo.org>

Code to look for a local html handbook is obsolete.  Link to the wiki
handbook instead, and install the entry unconditionally for gentoo
targets.

Signed-off-by: Ben Kohler <bkohler@gentoo.org>
---
 targets/support/livecdfs-update.sh | 32 ++++++++++++------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 16e201d5..bf19ccf5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -112,28 +112,22 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l
 
 # Post configuration
 case ${clst_livecd_type} in
-	gentoo-release-live*)
+	gentoo-release-*)
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
-		create_handbook_icon() {
-			cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
-				[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=text-editor
-			EOF
-		}
-
-		# Create our Handbook icon
-		[ -e /docs/handbook/index.html ] && create_handbook_icon
-		[ -n "${clst_livecd_overlay}" ] && [ -e ${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon
+		cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
+			[Desktop Entry]
+			Encoding=UTF-8
+			Version=1.0
+			Type=Link
+			URL=https://wiki.gentoo.org/wiki/Handbook:Main_Page
+			Terminal=false
+			Name=Gentoo Linux Handbook
+			GenericName=Gentoo Linux Handbook
+			Comment=This is a link to Gentoo Linux Handbook.
+			Icon=text-editor
+		EOF
 
 		# Copy our icons into place and build home directories
 		if [ -n "${clst_livecd_users}" ]
-- 
2.40.0



  parent reply	other threads:[~2023-03-29 19:31 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-29 19:30 [gentoo-catalyst] [PATCH 01/10] remove gamecd motd file Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 02/10] reorganize motd files Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 03/10] livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 04/10] livecdfs-update.sh: remove old devfsd code Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 05/10] livecdfs-update.sh: remove net.eth[1234] symlinks Ben Kohler
2023-03-29 19:40   ` Christian Iwata Nilsson
2023-03-29 19:51     ` Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 06/10] livecdfs-update.sh: remove confusing "reduce tmpfs usage" hack Ben Kohler
2023-03-29 19:30 ` Ben Kohler [this message]
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 08/10] livecdfs-update, livecd-bashrc: remove archaic X autostarting setup Ben Kohler
2023-03-29 19:30 ` [gentoo-catalyst] [PATCH 09/10] livecdfs-update: remove old evms code Ben Kohler
2023-03-29 19:31 ` [gentoo-catalyst] [PATCH 10/10] Remove obsolete universal cd target Ben Kohler
2023-03-30 12:54   ` Matt Turner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230329193100.2976079-7-bkohler@gentoo.org \
    --to=bkohler@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox