Fixed up spacing/coding style on stage4.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@978 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index f330c6bd2db3baddae27468d0754da6d5c62a76b..de606d7ab663bd213438a037ddf972734bb22a28 100644 (file)
--- 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.465 2005/12/19 15:28:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.466 2005/12/19 15:36:02 wolf31o2 Exp $
+
+  19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage4/stage4-chroot.sh, targets/stage4/stage4-controller.sh,
+  targets/stage4/stage4-preclean-chroot.sh:
+  Fixed up spacing/coding style on stage4.
 
   19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/stage2/stage2-chroot.sh, targets/stage2/stage2-controller.sh,

diff --git a/targets/stage4/stage4-chroot.sh b/targets/stage4/stage4-chroot.sh
index 4e50362754b973ffde884354c63bea3921fcb8a6..f9f55c53d49bde553fd20aeb5bf22b5af18104f3 100755 (executable)
--- a/targets/stage4/stage4-chroot.sh
+++ b/targets/stage4/stage4-chroot.sh
@@ -9,19 +9,18 @@ update_env_settings
 setup_myfeatures
 setup_myemergeopts
 
-## 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"       
 
 echo "Bringing system up to date using profile specific use flags"
 export USE="${USE} ${clst_HOSTUSE}"
 run_emerge -u system
 
-
 echo "Emerging packages using stage4 use flags"
 if [ -n "${clst_use}" ]
 then 

diff --git a/targets/stage4/stage4-controller.sh b/targets/stage4/stage4-controller.sh
index 58f4ff81b0c51aeab9b6cb64d8174a4bdaf3402e..f7a6ad5ab5f1be69b51019255d2a5b8e0a6cf13b 100755 (executable)
--- a/targets/stage4/stage4-controller.sh
+++ b/targets/stage4/stage4-controller.sh
@@ -1,9 +1,9 @@
 #!/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/stage4/stage4-controller.sh,v 1.11 2005/12/08 15:16:48 rocket Exp $
-. ${clst_sharedir}/targets/support/functions.sh
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage4/stage4-controller.sh,v 1.12 2005/12/19 15:36:02 wolf31o2 Exp $
 
+. ${clst_sharedir}/targets/support/functions.sh
 
 # Only put commands in this section that you want every target to execute.
 # This is a global default file and will affect every target
@@ -22,7 +22,7 @@ case $1 in
        kernel)
                shift
                export clst_kname="$1"
-               # if we have our own linuxrc, copy it in
+               # If we have our own linuxrc, copy it in
                if [ -n "${clst_linuxrc}" ]
                then
                        cp -a ${clst_linuxrc} ${clst_chroot_path}/tmp/linuxrc
@@ -37,54 +37,41 @@ case $1 in
                export clst_packages="$*"
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh
        ;;
-
        preclean)
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-preclean-chroot.sh ${clst_root_path}
        ;;
-       
        rc-update)
                exec_in_chroot  ${clst_sharedir}/targets/support/rc-update.sh
        ;;
-       
        fsscript)
                exec_in_chroot ${clst_fsscript}
        ;;
-
        livecd-update)
-               # now, finalize and tweak the livecd fs (inside of the chroot)
+               # Now, finalize and tweak the livecd fs (inside of the chroot)
                exec_in_chroot  ${clst_sharedir}/targets/support/livecdfs-update.sh
        ;;
-
-               bootloader)
+       bootloader)
                exit 0
        ;;
-       
        target_image_setup)
                shift
                #${clst_sharedir}/targets/livecd-stage2/livecd-stage2-cdfs.sh
                ${clst_sharedir}/targets/support/target_image_setup.sh $1
        ;;
-       
        unmerge)
                shift
                export clst_packages="$*"
                exec_in_chroot ${clst_sharedir}/targets/support/unmerge.sh 
        ;;
-
        iso)
-       
                shift
                ${clst_sharedir}/targets/support/create-iso.sh $1
        ;;
-
        clean)
                exit 0
        ;;
-       
        *)
                exit 1
        ;;
-
 esac
-
 exit $?

diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 7198068f65ff7ef8d16fd5cee79627fb9d17ad85..72efa3570b7f1c70ea7a20fcbfb14f653b0e194f 100755 (executable)
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -1,6 +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/stage4/stage4-preclean-chroot.sh,v 1.3 2005/12/19 15:36:02 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 #update_env_settings