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 D179E138350 for ; Tue, 31 Mar 2020 18:39:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5D3BE0986; Tue, 31 Mar 2020 18:39:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A986DE0986 for ; Tue, 31 Mar 2020 18:39:00 +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 8679134F393 for ; Tue, 31 Mar 2020 18:38:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D30B150 for ; Tue, 31 Mar 2020 18:38:57 +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: <1585679893.858665d913d457ded107d01b132bf6af64cb3842.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/livecd-stage2/, targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/livecd-stage2/controller.sh targets/support/livecdfs-update.sh X-VCS-Directories: targets/livecd-stage2/ targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 858665d913d457ded107d01b132bf6af64cb3842 X-VCS-Branch: master Date: Tue, 31 Mar 2020 18:38:57 +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: dcdb9a38-0f34-4ce2-9168-9c220e3a58e9 X-Archives-Hash: 8fbe3b2900b90e54d6daef7c5a91b817 commit: 858665d913d457ded107d01b132bf6af64cb3842 Author: Christos Kotsi gmail com> AuthorDate: Wed Apr 12 08:43:44 2017 +0000 Commit: Matt Turner gentoo org> CommitDate: Tue Mar 31 18:38:13 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=858665d9 targets: Combine some cp commands Signed-off-by: Matt Turner gentoo.org> targets/livecd-stage2/controller.sh | 12 +++--------- targets/support/livecdfs-update.sh | 8 ++------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh index 166d1b0f..463c37e7 100755 --- a/targets/livecd-stage2/controller.sh +++ b/targets/livecd-stage2/controller.sh @@ -42,11 +42,7 @@ case $1 in echo "${clst_livecd_type}. You should switch to using" echo "generic-livecd instead." fi - cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ - ${clst_sharedir}/livecd/files/universal.motd.txt \ - ${clst_sharedir}/livecd/files/minimal.motd.txt \ - ${clst_sharedir}/livecd/files/livecd.motd.txt \ - ${clst_chroot_path}/etc + cp -pPR ${clst_sharedir}/livecd/files/*.motd.txt ${clst_chroot_path}/etc ;; *) if [ -n "${clst_livecd_motd}" ] @@ -133,8 +129,7 @@ case $1 in exit 1 fi fi - cp -f ${clst_snapshot_path} $1/snapshots - cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots + cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots ;; gentoo-release-livedvd) targets="distfiles snapshots stages" @@ -157,8 +152,7 @@ case $1 in continue ;; snapshots) - cp -f ${clst_snapshot_path} $1/snapshots - cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots + cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots ;; stages) ### TODO: make this copy stages diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 2a0a1f72..0f39eab0 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -264,8 +264,7 @@ case ${clst_livecd_type} in USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | ${clst_sed} -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt # This is my hack to reduce tmpfs usage - cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd - cp -r ${clst_repo_basedir}/${clst_repo_name}/eclass /usr/livecd + cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} mv -f /etc/gconf /usr/livecd ln -sf /usr/livecd/gconf /etc/gconf @@ -292,10 +291,7 @@ case ${clst_livecd_type} in # 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-dialog.desktop \ - /home/${username}/Desktop + cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop ${clst_sed} -i -e \ 's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ /home/${username}/Desktop/installer-dialog.desktop