Skip to Content.
Sympa Menu

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

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 (44fba1444b09f43224ae8e5cb7d1adce21acfc7b)
  • Date: Sun, 8 Feb 2009 12:28:32 -0600

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

iso/usr/share/doc/smgl.install/steps/select-spells | 2 +-
iso/usr/share/smgl.install/bashrc | 1 +
iso/usr/share/smgl.install/smgl-spells | 2 +-
scripts/spellcaster.sh | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)

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

smgl.install/bashrc: cp rspells to /tmp if exists

If the rspells listing is included in the ISO, copy it to /tmp for
easier access by the end-user.

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

scripts/spellcaster.sh: put rspells in install dir

Don't drop rspells directly into tmp, since that is "overwritten" at
bootup due to a tmpfs being loaded over /tmp. Instead, drop it into the
smgl.install dir, and have the installer drop it into /tmp after
startup.

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

steps/select-spells: highlight rspells note

Highlight the note about the rspells overlap with bold.

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

smgl.install/smgl-spells: adjust info for rspells

Now that the rspells list is included on the ISO, reference that instead
of directing the user to the website during the install.

diff --git a/iso/usr/share/doc/smgl.install/steps/select-spells
b/iso/usr/share/doc/smgl.install/steps/select-spells
index ad90912..f8c3b78 100644
--- a/iso/usr/share/doc/smgl.install/steps/select-spells
+++ b/iso/usr/share/doc/smgl.install/steps/select-spells
@@ -3,7 +3,7 @@ You may now select the spells you would like that are
provided on the ISO.
There are currently two ways that you can accomplish this. Both methods make
use of /tmp/spells. It is crucial to install some spells (such as a
bootloader)
or your system may not function, so some of these have been included as
-defaults in /tmp/spells. NOTE: the ISO caches represent ALL spells installed
+defaults in /tmp/spells. NOTE: the ISO caches represent ALL spells
installed
for the ISO runtime, and are selectable for install, regardless of whether
they
are also included in system.tar.bz2 as well - gcc, glibc, bash, etc. are
avaialble both in system.tar.bz2 AND in the ISO's /var/cache/sorcery/
diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index 492e891..49fa3f1 100644
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -14,6 +14,7 @@ OPT_SPELLS=/tmp/spells
mkdir -p $INSTALLER_TMP
[[ -e $INSTALLER_STATUS ]] || echo 'init' >$INSTALLER_STATUS
[[ -e $OPT_SPELLS ]] || cat $INSTALLER_DATA/spells > $OPT_SPELLS
+[[ -f $INSTALLER_DATA/rspells ]] && cp -f $INSTALLER_DATA/rspells
/tmp/rspells

function header() {
echo ""
diff --git a/iso/usr/share/smgl.install/smgl-spells
b/iso/usr/share/smgl.install/smgl-spells
index 4436b6c..4b93544 100755
--- a/iso/usr/share/smgl.install/smgl-spells
+++ b/iso/usr/share/smgl.install/smgl-spells
@@ -171,7 +171,7 @@ function message() {
Note that some all caches present on the ISO are included in the list for
selection, including caches that may also be installed by system.tar.bz2.
This is intentional. To see what spells are in system.tar.bz2, please see
- the release notes for this ISO.
+ /tmp/rspells.

The output is piped through less, so if there are too many caches to
fit on one screen you will be able to scroll. When you are satisfied with
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 2f4eb01..33451e3 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -559,7 +559,7 @@ function setup_iso() {
"$MYDIR"/add-sauce.sh -o -i "$ISODIR"

# add the rspells list to the ISO for later reference
- cp -f "$CAULDRONDIR/rspells.$TYPE" "$ISODIR"/tmp/rspells
+ cp -f "$CAULDRONDIR/rspells.$TYPE"
"$ISODIR"/usr/share/smgl.install/rspells

# save the grimoire version used for building everything to ISODIR
for reference
msg "Saving grimoire version to ISODIR"



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

Archive powered by MHonArc 2.6.24.

Top of Page