Skip to Content.
Sympa Menu

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

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 (28d2f14f3d24df0ed257683134de10b1b7864d2d)
  • Date: Mon, 5 Jan 2009 09:30:47 -0600

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

iso/isolinux/isolinux.msg | 2 +-
scripts/mkrelease.sh | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)

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

scripts/mkrelease.sh: better grimoire version code

The real problem with the grimoire version sed string before was
actually not with the '-' being in the string, but with the fact that
the grimoire version info is actually two lines. The code was changed so
that GRIMOIRE_VER only holds the first line, which is the actual version
information, and doesn't include the second line which is the checksum.
The output is now correct.

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

isolinux/isolinux.msg: add "grimoire"

Added the word "grimoire" to make it clear that the version being given
in the output refers to a grimoire that the ISO was built using.

diff --git a/iso/isolinux/isolinux.msg b/iso/isolinux/isolinux.msg
index 63ff42c..a474b45 100644
--- a/iso/isolinux/isolinux.msg
+++ b/iso/isolinux/isolinux.msg
@@ -1,5 +1,5 @@
SMGL-@ISO_VERSION@ by the Source Mage GNU/Linux team
0e<www.sourcemage.org>07
-This ISO made using @GRIMOIRE_VERSION@.
+This ISO made using grimoire @GRIMOIRE_VERSION@.

09Welcome07 to 04Source Mage GNU/Linux07
Copyright (C) 2000-2001 by Kyle Sallee
diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh
index 1671c29..7f38c66 100755
--- a/scripts/mkrelease.sh
+++ b/scripts/mkrelease.sh
@@ -64,7 +64,7 @@ fi
[[ $# -lt 2 ]] && usage

# Get the grimoire version used to generate all the spells in the ISO.
-GRIMOIRE_VER=$(< "$TARGET"/etc/grimoire_version)
+GRIMOIRE_VER=$(head -n1 "$TARGET"/etc/grimoire_version)

# Replace all ISO_VERSION placeholders with the ISO version passed on the
# commandline.
@@ -74,9 +74,7 @@ do
done

# Replace the GRIMOIRE_VERSION placeholder (currently only in isolinux.msg).
-half1=$(echo $GRIMOIRE_VER | cut -d- -f1)
-half2=$(echo $GRIMOIRE_VER | cut -d- -f2)
-sed -i "s/@GRIMOIRE_VERSION@/${half1}-${half2}/"
"$TARGET"/isolinux/isolinux.msg
+sed -i "s/@GRIMOIRE_VERSION@/$GRIMOIRE_VER/" "$TARGET"/isolinux/isolinux.msg

# Generate the release ISO. Currently we force KEEP and COMPRESSION.
if [[ -n $ISOCHOWN ]]



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

Archive powered by MHonArc 2.6.24.

Top of Page