Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b85c07e3a0570af73995a035a26d4ae5d2d814ac)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b85c07e3a0570af73995a035a26d4ae5d2d814ac)
  • Date: Thu, 2 Oct 2008 14:06:24 -0500

GIT changes to test cauldron by Justin Boffemmyer <flux AT sourcemage.org>:

scripts/add-sauce.sh | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit b85c07e3a0570af73995a035a26d4ae5d2d814ac
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/add-sauce.sh: check before overwriting

The script will now scan each file individually and if it finds the
same file in the target dir, it prompts the user before overwriting
the contents. No more wiping out isolinux settings due to trying to
ensure ISO sanity :-D

diff --git a/scripts/add-sauce.sh b/scripts/add-sauce.sh
index 87dc1db..f59e9ab 100755
--- a/scripts/add-sauce.sh
+++ b/scripts/add-sauce.sh
@@ -54,5 +54,27 @@ chmod -R u=rwX,go=u-w $TEMPDIR/
chmod 0600 $TEMPDIR/etc/shadow
# ==== end fixup ====

-cp -a $TEMPDIR/* $CHROOTDIR/
+for i in $(find $TEMPDIR -print)
+do
+ FILE=${i#$TEMPDIR/}
+ if [[ -d $i ]]
+ then
+ continue
+ fi
+
+ if [[ -e $CHROOTDIR/$FILE ]]
+ then
+ echo -n "Overwrite ${FILE}? [yn] "
+ read -n1 OVERWRITE
+ echo ""
+ if [[ $OVERWRITE == y ]]
+ then
+ cp -a $TEMPDIR/$FILE $CHROOTDIR/
+ fi
+ else
+ cp -a $TEMPDIR/$FILE $CHROOTDIR/
+ fi
+done
+
rm -rf $TEMPDIR
+



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (b85c07e3a0570af73995a035a26d4ae5d2d814ac), Justin Boffemmyer, 10/02/2008

Archive powered by MHonArc 2.6.24.

Top of Page