[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (95b52e312c032209bd9294fcf7d60af7eb67eab1)

Justin Boffemmyer scm at sourcemage.org
Mon Dec 29 20:15:38 EST 2008


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

 scripts/spellcaster.sh |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 95b52e312c032209bd9294fcf7d60af7eb67eab1
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    scripts/spellcaster.sh: fix sorcery install
    
    The sorcery install script needs to be called from the directory it
    resides in or it will fail.

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 3e8f480..9bec322 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -188,6 +188,7 @@ SPELLS
 function setup_sys() {
 	local SPOOL="$TARGET/var/spool"
 	local SORCERY="sorcery-stable.tar.bz2"
+	local SORCERYDIR="$TARGET/usr/src/sorcery"
 
 	# unpack the sys caches into SYSDIR
 	for cache in $(<"$TARGET"/sys-list)
@@ -203,7 +204,9 @@ function setup_sys() {
 
 	# unpack and install sorcery into SYSDIR
 	tar jxf "$SPOOL"/$SORCERY -C "$TARGET/usr/src"
-	"$TARGET/usr/src/sorcery/install" "$SYSDIR"
+	pushd "$SORCERYDIR" &> /dev/null
+	./install "$SYSDIR"
+	popd
 }
 
 function setup_iso() {



More information about the SM-Commit mailing list