Skip to Content.
Sympa Menu

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

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 (36b29c0b34e79b1cb210ccebfbc98e584517d9e4)
  • Date: Sun, 8 Feb 2009 22:15:05 -0600

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

base/etc/sysconfig/facilities | 2 +-
iso/usr/share/smgl.install/smgl-enchant | 7 +++++--
scripts/spellcaster.sh | 8 ++++----
3 files changed, 10 insertions(+), 7 deletions(-)

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

base/etc/sysconfig/facilities: remove spurious .sh

Remove an unwanted .sh extension from "modutils" due to typo.

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

scripts/spellcaster.sh: quote variables

Quote the tablet-referring variables in the subscript for setup_sys.

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

smgl.install/smgl-enchant: cp facilities w/ system

Only copy over (overwrite) the facilites config if not directly
unpacking caches. If the user is directly unpacking caches, then we can
assume the user knows what they are doing and leave it to them.

diff --git a/base/etc/sysconfig/facilities b/base/etc/sysconfig/facilities
index 4041176..af23cfc 100644
--- a/base/etc/sysconfig/facilities
+++ b/base/etc/sysconfig/facilities
@@ -1,7 +1,7 @@

root_fs=mountroot.sh

-modules=modutils.sh
+modules=modutils

network=network

diff --git a/iso/usr/share/smgl.install/smgl-enchant
b/iso/usr/share/smgl.install/smgl-enchant
index 1621a3d..15c8a81 100755
--- a/iso/usr/share/smgl.install/smgl-enchant
+++ b/iso/usr/share/smgl.install/smgl-enchant
@@ -130,7 +130,10 @@ sort -u -o "$depends" "$depends"
echo "Regenerating $packages"
sort -u -o "$packages" "$packages"

-echo "Overwriting $TARGET/etc/sysconfig/facilities with ISO copy"
-cp -f /etc/sysconfig/facilities "$TARGET"/etc/sysconfig/facilities
+if [[ ! $NOSYS == "yes" ]]
+then
+ echo "Overwriting $TARGET/etc/sysconfig/facilities with ISO copy"
+ cp -f /etc/sysconfig/facilities "$TARGET"/etc/sysconfig/facilities
+fi

# vim:tabstop=2:softtabstop=2:shiftwidth=2:expandtab:ai
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index b0a8f95..cacd980 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -493,11 +493,11 @@ function setup_sys() {
do
for date in "$spell"/*
do
- tablet_get_version $date ver &&
- tablet_get_status $date stat &&
- tablet_get_depends $date dep &&
+ tablet_get_version "$date" ver &&
+ tablet_get_status "$date" stat &&
echo "${spell##*/}:${date##*/}:$stat:$ver" >>
"$packages"
- cat "$dep" >> "$depends"
+ tablet_get_depends "$date" dep &&
+ [[ -f "$dep" ]] && cat "$dep" >> "$depends"
done
done &&
sort -u -o "$depends" "$depends" &&



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (36b29c0b34e79b1cb210ccebfbc98e584517d9e4), Justin Boffemmyer, 02/08/2009

Archive powered by MHonArc 2.6.24.

Top of Page