Skip to Content.
Sympa Menu

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

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 (daf66412138785db43ef5df6f55443d97a432e03)
  • Date: Mon, 13 Oct 2008 21:59:52 -0500

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

scripts/mkiso.sh | 4 ++--
scripts/mksystem.sh | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)

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

scripts/mksystem.sh: saner error checking

Check to make sure $SYSDIR is non-empty *before* testing and modifying
it. This is much saner/more logical than doing the test afterwards.

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

scripts/mkiso.sh: simpler compress option handling

Simplified the handling of the compress option by using true and false
instead of string values.

diff --git a/scripts/mkiso.sh b/scripts/mkiso.sh
index 4e6e95f..455572d 100755
--- a/scripts/mkiso.sh
+++ b/scripts/mkiso.sh
@@ -1,6 +1,6 @@
#!/bin/bash

-COMPRESS="no"
+COMPRESS=false
ISOCHOWN=false
KEEP=

@@ -62,7 +62,7 @@ ISO_VERSION=$2

$SUODOCMD mkisofs -R -b isolinux/isolinux.bin -c isolinux/boot.cat
-no-emul-boot -boot-load-size 4 -boot-info-table -V ${ISO_VERSION} -publisher
"Source Mage GNU/Linux" -p "Cauldron" -o "${ISO_VERSION}.iso" "$ISO_CHROOT"

-if [[ "$COMPRESS" == yes || -n "$KEEP" ]]
+if [[ $COMPRESS || -n $KEEP ]]
then
$SUODOCMD bzip2 -f -v $KEEP "${ISO_VERSION}.iso"
fi
diff --git a/scripts/mksystem.sh b/scripts/mksystem.sh
index 0a67030..375c0fc 100755
--- a/scripts/mksystem.sh
+++ b/scripts/mksystem.sh
@@ -48,12 +48,11 @@ fi
SYSDIR=${1:-system}
SYSTAR="${2:-$(basename $SYSDIR).tar.bz2}"

+[[ -z $SYSDIR ]] && usage
+
[[ $(dirname $SYSDIR) == '.' ]] && SYSDIR="$PWD/$SYSDIR"
[[ $(dirname $SYSTAR) == '.' ]] && SYSTAR="$PWD/$SYSTAR"

-
-[[ -z $SYSDIR ]] && usage
-
cd $SYSDIR
$SUDOCMD tar $VERBOSE -jcf "$SYSTAR" *
echo "Output written to: $SYSTAR"




Archive powered by MHonArc 2.6.24.

Top of Page