Skip to Content.
Sympa Menu

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

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 (e7223d08ca10cf808a04003692977e1437bddb38)
  • Date: Sun, 4 Jan 2009 08:16:55 -0600

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

scripts/cleaniso.sh | 16 ++++++++++++++--
scripts/mkrelease.sh | 9 ++++++++-
2 files changed, 22 insertions(+), 3 deletions(-)

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

scripts/mkrelease.sh: set the MYDIR variable

Set the MYDIR variable used when calling other scripts.

commit b6e6f37b2a6c8db1d5bc2c2ad84330ec805d8fdd
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/cleaniso.sh: more cleaning, abs. cmd paths

Added more directories to clean out from the ISO, and changed the chroot
commands to use absolute command paths to rm and rmdir.

commit ed956dbb3e9548b67c91a0a8a9c607dcbde77149
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scrips/mkrelease.sh: fix handling of CHOWN

Needed to branch the CHOWN stuff since chown would complain if the
variables were empty. Now the chown run is completely avoided unless
specifically passed in.

diff --git a/scripts/cleaniso.sh b/scripts/cleaniso.sh
index 769ee27..0ec4b53 100755
--- a/scripts/cleaniso.sh
+++ b/scripts/cleaniso.sh
@@ -100,13 +100,25 @@ do
then
# chroot and clean a directory using rmdir
echo "Attempting to remove directory
$ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" rmdir
--ignore-fail-on-non-empty "$DIRT"
+ chroot "$ISOCHROOT" /bin/rmdir
--ignore-fail-on-non-empty "$DIRT"
else
# chroot and clean an individual file
echo "Attempting to delete $ISOCHROOT/$DIRT"
- chroot "$ISOCHROOT" rm -f "$DIRT"
+ chroot "$ISOCHROOT" /bin/rm -f "$DIRT"
fi
fi
done
done

+echo "Removing $ISOCHROOT/usr/include"
+chroot /bin/rm -fr "$ISOCHROOT/usr/include"
+
+echo "Removing $ISOCHROOT/usr/share/doc"
+chroot /bin/rm -fr "$ISOCHROOT/usr/share/doc"
+
+echo "Removing $ISOCHROOT/var/log/sorcery"
+chroot /bin/rm -fr "$ISOCHROOT/var/log/sorcery"
+
+echo "Removing $ISOCHROOT/var/state/sorcery"
+chroot /bin/rm -fr "$ISOCHROOT/var/state/sorcery"
+
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index be14c01..6f93247 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -1,5 +1,7 @@
#!/bin/bash

+MYDIR="$(dirname $0)"
+
TARGET=$1
VERSION=$2

@@ -75,5 +77,10 @@ done
sed -i "s/@GRIMOIRE_VERSION@/$GRIMOIRE_VER/" "$TARGET"/isolinux/isolinux.msg

# Generate the release ISO. Currently we force KEEP and COMPRESSION.
-$(dirname $0)/mkiso.sh "$ISOCHOWN $CHOWNSTR" -kz "$TARGET" "smgl-$VERSION"
+if [[ -n $ISOCHOWN ]]
+then
+ "$MYDIR"/mkiso.sh "$ISOCHOWN $CHOWNSTR" -kz "$TARGET" "smgl-$VERSION"
+else
+ "$MYDIR"/mkiso.sh -kz "$TARGET" "smgl-$VERSION"
+fi




  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (e7223d08ca10cf808a04003692977e1437bddb38), Justin Boffemmyer, 01/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page