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 133BF139694 for ; Wed, 12 Apr 2017 08:44:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48F99E0D1A; Wed, 12 Apr 2017 08:44:12 +0000 (UTC) Received: from mail-wr0-x244.google.com (mail-wr0-x244.google.com [IPv6:2a00:1450:400c:c0c::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 067B5E0D1A for ; Wed, 12 Apr 2017 08:44:11 +0000 (UTC) Received: by mail-wr0-x244.google.com with SMTP id u18so3111353wrc.1 for ; Wed, 12 Apr 2017 01:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=cq3cUcg0iVZOMj9Th7vJMD3O3G70/N6AnXHMgKOSb00=; b=ZWrcjWbRlrWwfAIERTL3r1iKUyJQgC1VuReKxgebuvt7HE+2MzTP0U/31xwXmFR+cy r0sF8AIM6PF//QvGkQ+4gX14+BEeEfw1Nl0jGUsJ2NLGpiloR5CBYdbhavC/PpFbnpMq iuhLx0rNQ5XrNBEC2iy356LYveydyjNAQ/BeS3qXwUnRS3UpE8pW8gtLmt4fvQQYyJLm 46CzKUotwbjh+y8Nu5qeGjwYNoUjCogPjfpEwFgYgIm30PS5lZhLrKTGwQ9fFcbeKTpv v62wc0VijSRXw4IJP70deogFVEupJpfJCiCubOUGFl6EJ0y6TMHQKsnmHD5EaCAMzhI1 EELA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cq3cUcg0iVZOMj9Th7vJMD3O3G70/N6AnXHMgKOSb00=; b=HukkDc4V3hLFE3N+bj3gR1OYcvqYM+15MlVWIKQdMIuhCp5pBrGsGKXAmOFrOMVryC ClgvnmUu1EVLZeXK/tzasjWZDAAJdBt8NcZaGQqQfYNORrIh0Ks+vof8wz6FUmFE8SCM ssx06OZdECJdRkK9czErD5lLacnuj8q4A8WqTfGrEuqb6KvaShLsoCADNi6WSzmGfu0v ih8Ctt0G8IbZead2Mya5PKqHjEjtZq2FQ1rl+w4DlKwba59YyxOu9R+9z5MU35D8cEEE 2KgUR6QB15+adkpCW/GXUI1D+KRIhQIjFbe5OnJ6ISC9uMoy7Mtd5mfmc/xMbxZgxPCe GQiw== X-Gm-Message-State: AN3rC/4UMtM4CUcKdNombo43HI08GQEzoNSfCjXrlp+J+WdWNNiIW7pkzdimvq/T4o+UEQ== X-Received: by 10.223.175.81 with SMTP id z75mr1767430wrc.11.1491986650702; Wed, 12 Apr 2017 01:44:10 -0700 (PDT) Received: from localhost.localdomain (ppp005055006220.access.hol.gr. [5.55.6.220]) by smtp.googlemail.com with ESMTPSA id g53sm453131wrg.22.2017.04.12.01.44.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Apr 2017 01:44:10 -0700 (PDT) From: Christos Kotsi To: gentoo-catalyst@lists.gentoo.org Cc: christo.kotsi@gmail.com Subject: [gentoo-catalyst] [PATCH 1/6] Concentrated some cp commands Date: Wed, 12 Apr 2017 11:43:44 +0300 Message-Id: <20170412084349.2017-1-christo.kotsi@gmail.com> X-Mailer: git-send-email 2.10.2 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-Archives-Salt: 08f2e0e3-290c-444a-8505-19f77ae7b6b5 X-Archives-Hash: 88e8cb897156c5ce9bba437c5702a3b5 --- targets/livecd-stage2/livecd-stage2-controller.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index 10ee98e..16a9071 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -42,12 +42,9 @@ 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_sharedir}/livecd/files/gamecd.motd.txt \ - ${clst_chroot_path}/etc + cp -pPR ${clst_sharedir}/livecd/files/{generic.motd.txt,universal.motd.txt,minimal.motd.txt} ${clst_chroot_path}/etc + cp -pPR ${clst_sharedir}/livecd/files/{livecd.motd.txt,gamecd.motd.txt} ${clst_chroot_path}/etc + ;; *) if [ -n "${clst_livecd_motd}" ] @@ -147,8 +144,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" @@ -171,8 +167,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 -- 2.10.2