| 1 |
commit: 858665d913d457ded107d01b132bf6af64cb3842 |
| 2 |
Author: Christos Kotsi <christo.kotsi <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 12 08:43:44 2017 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 31 18:38:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=858665d9 |
| 7 |
|
| 8 |
targets: Combine some cp commands |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
targets/livecd-stage2/controller.sh | 12 +++--------- |
| 13 |
targets/support/livecdfs-update.sh | 8 ++------ |
| 14 |
2 files changed, 5 insertions(+), 15 deletions(-) |
| 15 |
|
| 16 |
diff --git a/targets/livecd-stage2/controller.sh b/targets/livecd-stage2/controller.sh |
| 17 |
index 166d1b0f..463c37e7 100755 |
| 18 |
--- a/targets/livecd-stage2/controller.sh |
| 19 |
+++ b/targets/livecd-stage2/controller.sh |
| 20 |
@@ -42,11 +42,7 @@ case $1 in |
| 21 |
echo "${clst_livecd_type}. You should switch to using" |
| 22 |
echo "generic-livecd instead." |
| 23 |
fi |
| 24 |
- cp -pPR ${clst_sharedir}/livecd/files/generic.motd.txt \ |
| 25 |
- ${clst_sharedir}/livecd/files/universal.motd.txt \ |
| 26 |
- ${clst_sharedir}/livecd/files/minimal.motd.txt \ |
| 27 |
- ${clst_sharedir}/livecd/files/livecd.motd.txt \ |
| 28 |
- ${clst_chroot_path}/etc |
| 29 |
+ cp -pPR ${clst_sharedir}/livecd/files/*.motd.txt ${clst_chroot_path}/etc |
| 30 |
;; |
| 31 |
*) |
| 32 |
if [ -n "${clst_livecd_motd}" ] |
| 33 |
@@ -133,8 +129,7 @@ case $1 in |
| 34 |
exit 1 |
| 35 |
fi |
| 36 |
fi |
| 37 |
- cp -f ${clst_snapshot_path} $1/snapshots |
| 38 |
- cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots |
| 39 |
+ cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots |
| 40 |
;; |
| 41 |
gentoo-release-livedvd) |
| 42 |
targets="distfiles snapshots stages" |
| 43 |
@@ -157,8 +152,7 @@ case $1 in |
| 44 |
continue |
| 45 |
;; |
| 46 |
snapshots) |
| 47 |
- cp -f ${clst_snapshot_path} $1/snapshots |
| 48 |
- cp -f ${clst_snapshot_path}.DIGESTS $1/snapshots |
| 49 |
+ cp -f ${clst_snapshot_path}{,.DIGESTS} $1/snapshots |
| 50 |
;; |
| 51 |
stages) |
| 52 |
### TODO: make this copy stages |
| 53 |
|
| 54 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 55 |
index 2a0a1f72..0f39eab0 100755 |
| 56 |
--- a/targets/support/livecdfs-update.sh |
| 57 |
+++ b/targets/support/livecdfs-update.sh |
| 58 |
@@ -264,8 +264,7 @@ case ${clst_livecd_type} in |
| 59 |
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 |
| 60 |
|
| 61 |
# This is my hack to reduce tmpfs usage |
| 62 |
- cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd |
| 63 |
- cp -r ${clst_repo_basedir}/${clst_repo_name}/eclass /usr/livecd |
| 64 |
+ cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd |
| 65 |
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} |
| 66 |
mv -f /etc/gconf /usr/livecd |
| 67 |
ln -sf /usr/livecd/gconf /etc/gconf |
| 68 |
@@ -292,10 +291,7 @@ case ${clst_livecd_type} in |
| 69 |
# Copy our installer icons |
| 70 |
if [ -e /usr/share/applications/installer-gtk.desktop ] |
| 71 |
then |
| 72 |
- cp -f /usr/share/applications/installer-gtk.desktop \ |
| 73 |
- /home/${username}/Desktop |
| 74 |
- cp -f /usr/share/applications/installer-dialog.desktop \ |
| 75 |
- /home/${username}/Desktop |
| 76 |
+ cp -f /usr/share/applications/installer-{gtk,dialog}.desktop /home/${username}/Desktop |
| 77 |
${clst_sed} -i -e \ |
| 78 |
's:Exec=installer-dialog:Exec=sudo installer-dialog:' \ |
| 79 |
/home/${username}/Desktop/installer-dialog.desktop |
Archives