From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B942215802F for ; Wed, 29 Mar 2023 19:31:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4C2642BC03B; Wed, 29 Mar 2023 19:31:14 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 324062BC03B for ; Wed, 29 Mar 2023 19:31:14 +0000 (UTC) From: Ben Kohler 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 Message-Id: <20230329193100.2976079-7-bkohler@gentoo.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230329193100.2976079-1-bkohler@gentoo.org> References: <20230329193100.2976079-1-bkohler@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b7b286f7-3491-4149-8031-ea57b1fe6ff5 X-Archives-Hash: 2568dfc3fb0bfbe71c5e322316a6ccda 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 --- 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