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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EE678138359 for ; Tue, 20 Oct 2020 04:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7EC9E086A; Tue, 20 Oct 2020 04:31:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 39101E084E for ; Tue, 20 Oct 2020 04:31:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B31A34085A for ; Tue, 20 Oct 2020 04:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC9D73B3 for ; Tue, 20 Oct 2020 04:31:50 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1603166105.e7a8563d44041f61736562bd9923e64a8c7ffead.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e7a8563d44041f61736562bd9923e64a8c7ffead X-VCS-Branch: pending/mattst88 Date: Tue, 20 Oct 2020 04:31:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1f0c130f-0048-40eb-80ea-b39c8e91b3fc X-Archives-Hash: eb8244f521299c5c6de633ca9754d894 commit: e7a8563d44041f61736562bd9923e64a8c7ffead Author: Matt Turner gentoo org> AuthorDate: Mon Oct 19 22:47:34 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Oct 20 03:55:05 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e7a8563d targets: Move create_handbook_icon() to its use And use <<- so we can indent the heredoc properly. Signed-off-by: Matt Turner gentoo.org> targets/support/chroot-functions.sh | 14 -------------- targets/support/livecdfs-update.sh | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 307a9042..22340023 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -303,20 +303,6 @@ show_debug() { 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=text-editor" > /usr/share/applications/gentoo-handbook.desktop -} - readonly locales=" C.UTF8 UTF-8 " diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 557d990b..47dbb5b3 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -243,6 +243,21 @@ case ${clst_livecd_type} in # 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