From: Chris Gianelloni Date: Fri, 16 Dec 2005 19:14:46 +0000 (+0000) Subject: Fixed up spacing/coding style on grp. X-Git-Tag: CATALYST_2_0_6_916~521 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c417415d71720f2b36165dbf10bf6602f755270;p=catalyst.git Fixed up spacing/coding style on grp. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@973 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 6f409077..2ff34a43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.460 2005/12/16 19:08:59 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.461 2005/12/16 19:14:45 wolf31o2 Exp $ + + 16 Dec 2005; Chris Gianelloni + targets/grp/grp-chroot.sh, targets/grp/grp-controller.sh, + targets/grp/grp-preclean-chroot.sh: + Fixed up spacing/coding style on grp. 16 Dec 2005; Chris Gianelloni targets/embedded/embedded-chroot.sh, diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh index 99f18c0a..25689203 100755 --- a/targets/grp/grp-chroot.sh +++ b/targets/grp/grp-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.24 2005/12/09 19:03:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.25 2005/12/16 19:14:46 wolf31o2 Exp $ . /tmp/chroot-functions.sh @@ -11,19 +11,19 @@ update_env_settings setup_myfeatures -# setup the environment +# Setup the environment export FEATURES="${clst_myfeatures}" ## START BUILD setup_portage -#turn off auto-use: +# Turn off auto-use: export USE_ORDER="env:pkg:conf:defaults" unset DISTDIR -#don't grab MS core fonts, etc. +# Don't grab MS core fonts, etc. export USE="${USE} ${clst_use}" - + if [ "${clst_grp_type}" = "pkgset" ] then unset DISTDIR @@ -36,7 +36,8 @@ then if [ -n "${clst_VERBOSE}" ] then - emerge --usepkg --buildpkg --noreplace --newuse -vp ${clst_myemergeopts} ${clst_grp_packages} || exit 1 + emerge --usepkg --buildpkg --noreplace --newuse -vp \ + ${clst_myemergeopts} ${clst_grp_packages} || exit 1 echo "Press any key within 15 seconds to pause the build..." read -s -t 15 -n 1 if [ $? -eq 0 ] @@ -45,8 +46,10 @@ then read -s -n 1 fi fi - emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} ${clst_grp_packages} || exit 1 + emerge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} \ + ${clst_grp_packages} || exit 1 else - DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1 + DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly \ + ${clst_grp_packages} || exit 1 unset PKGDIR fi diff --git a/targets/grp/grp-controller.sh b/targets/grp/grp-controller.sh index 7b72edbe..44960005 100755 --- a/targets/grp/grp-controller.sh +++ b/targets/grp/grp-controller.sh @@ -1,7 +1,8 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-controller.sh,v 1.3 2005/07/05 21:53:41 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-controller.sh,v 1.4 2005/12/16 19:14:46 wolf31o2 Exp $ + . ${clst_sharedir}/targets/support/functions.sh case $1 in diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh index 3d21ba88..01954e01 100755 --- a/targets/grp/grp-preclean-chroot.sh +++ b/targets/grp/grp-preclean-chroot.sh @@ -1,8 +1,7 @@ #!/bin/bash # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.8 2005/07/05 21:53:41 wolf31o2 Exp $ - +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.9 2005/12/16 19:14:46 wolf31o2 Exp $ . /tmp/chroot-functions.sh update_env_settings