Fixed up spacing/coding style on tinderbox.

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

diff --git a/ChangeLog b/ChangeLog
index 21590949c7465bec511d32fe9d41454ad42fb198..6857d014dc95cc94f44bf1084c35250a38124e44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.468 2005/12/19 16:52:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.469 2005/12/19 19:10:04 wolf31o2 Exp $
+
+  19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/tinderbox/tinderbox-chroot.sh,
+  targets/tinderbox/tinderbox-controller.sh,
+  targets/tinderbox/tinderbox-preclean-chroot.sh:
+  Fixed up spacing/coding style on tinderbox.
 
   19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/kill-chroot-pids.sh, targets/support/kmerge.sh,

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 55a5b87053755cfbd50009b752648bf63de1d5e6..394b2d9fccfab2127d398b9d9c7789b939da2696 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-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/tinderbox/tinderbox-chroot.sh,v 1.15 2005/12/08 15:16:48 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.16 2005/12/19 19:10:04 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -9,17 +9,18 @@ update_env_settings
 
 setup_myfeatures
 
-# setup the environment
+# Setup the environment
 export FEATURES="${clst_myfeatures}"
 
 # START THE BUILD
 setup_portage
 
-#turn off auto-use:
+# Turn off auto-use:
 export USE_ORDER="env:pkg:conf:defaults"       
-#back up pristine system
+# Backup pristine system
 
-rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / /tmp/rsync-bak/ 
+rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \
+       /tmp/rsync-bak/ 
 
 for x in ${clst_tinderbox_packages}
 do
@@ -38,7 +39,7 @@ do
        mkdir -p /tmp/packages/$x
        export PORT_LOGDIR="/tmp/packages/$x"
        run_emerge --usepkg --buildpkg --newuse $x
-       
+
        if [ "$?" != "0" ]
        then
                echo "! $x" >> /tmp/tinderbox.log       
@@ -46,5 +47,6 @@ do
                echo "$x" >> /tmp/tinderbox.log
        fi
        echo "Syncing from original pristine tinderbox snapshot..."
-       rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude "/usr/portage/" /tmp/rsync-bak/ /
+       rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \
+               "/usr/portage/" /tmp/rsync-bak/ /
 done

diff --git a/targets/tinderbox/tinderbox-controller.sh b/targets/tinderbox/tinderbox-controller.sh
index c6075490ca02b403cd2f9060d9cea2ecd3fda442..b19fab92083fac3956e83ec9f5662c3c35f261ca 100755 (executable)
--- a/targets/tinderbox/tinderbox-controller.sh
+++ b/targets/tinderbox/tinderbox-controller.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/tinderbox/tinderbox-controller.sh,v 1.4 2005/10/06 20:56:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-controller.sh,v 1.5 2005/12/19 19:10:04 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -10,20 +10,15 @@ case $1 in
                shift
                exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-chroot.sh
        ;;
-
        preclean)
                #exec_in_chroot ${clst_sharedir}/targets/tinderbox/tinderbox-preclean-chroot.sh
                delete_from_chroot /tmp/chroot-functions.sh
        ;;
-
        clean)
                exit 0
        ;;
-
        *)
                exit 1
        ;;
-       
 esac
-
 exit $?

diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
index d147cbdf64a5ace1c48b9beb651d042452f4994a..abf2e9365f72a426639a22916c755ab8ad8acfc1 100755 (executable)
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.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/tinderbox/tinderbox-preclean-chroot.sh,v 1.6 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.7 2005/12/19 19:10:04 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
+
 update_env_settings