commit: 858665d913d457ded107d01b132bf6af64cb3842
Author: Christos Kotsi <christo.kotsi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 12 08:43:44 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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
