Skip to Content.
Sympa Menu

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

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 master cauldron by Justin Boffemmyer (bd8fb9bd1ad514341d8f4f5d99d6d76daa263ffc)
  • Date: Sat, 9 Aug 2008 12:59:28 -0500

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

iso/usr/share/doc/smgl.install/help/index | 2 +-
iso/usr/share/doc/smgl.install/welcome | 4 ++--
iso/usr/share/smgl.install/bashrc | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)

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

back->prev, release_version

The back function was renamed to prev, for 2 reasons: 1) it was more
confusing to users since it didn't match with next, and 2) it will
make things easier if/when the back and forward browsing history is
pushed into mainline (currently in devel-flux branch).

Somehow @release@ got replaced to devel-20080207 on a previous commit
of mine. This fixes it back.

diff --git a/iso/usr/share/doc/smgl.install/help/index
b/iso/usr/share/doc/smgl.install/help/index
index fe1ae13..da822ba 100644
--- a/iso/usr/share/doc/smgl.install/help/index
+++ b/iso/usr/share/doc/smgl.install/help/index
@@ -1,9 +1,9 @@
-back return to the previous step in the list
help print a list of commands (this list)
help index print a list of commands (this list)
help editors print a list of editors available on the ISO
jump <step> jump directly to <step>
next go to the next step
+prev return to the previous step in the list
steps print a listing of all possible steps
todo show what needs to be done for the current step
welcome show some help information (seen at the welcome
screen)
diff --git a/iso/usr/share/doc/smgl.install/welcome
b/iso/usr/share/doc/smgl.install/welcome
index 7496808..810d2d3 100644
--- a/iso/usr/share/doc/smgl.install/welcome
+++ b/iso/usr/share/doc/smgl.install/welcome
@@ -1,9 +1,9 @@
-Welcome to the SMGL devel-20080207 install CD!
+Welcome to the SMGL @release@ install CD!

The install process is currently a guided shell prompt. Type next to
start.
Everytime you finish a step, enter next to advance to the next one.
If you want to re-read the documentation for a step, type todo.
-You can enter back at any time to jump to the previous step.
+You can enter prev at any time to jump to the previous step.

If you ever get lost, type steps to get a list of installer steps,
and e.g. jump copy-base to jump to a specific step.
diff --git a/iso/usr/share/smgl.install/bashrc
b/iso/usr/share/smgl.install/bashrc
index af23447..375a006 100755
--- a/iso/usr/share/smgl.install/bashrc
+++ b/iso/usr/share/smgl.install/bashrc
@@ -60,7 +60,7 @@ function next() {
todo
}

-function back() {
+function prev() {
local CURSTEP
CURSTEP=$(cat $INSTALLER_STATUS)
CURSTEP=$(grep ":$CURSTEP$" $INSTALLER_DATA/order | tail -n 1 | cut -d:
-f1)
@@ -99,7 +99,7 @@ function jump() {
fi
done
echo ""
- echo "Error: '$*' is not a recognized step."
+ [[ $good -eq 0 ]] && echo "Error: '$*' is not a recognized step."
echo "Type steps to see a list of steps."
}




  • [SM-Commit] GIT changes to master cauldron by Justin Boffemmyer (bd8fb9bd1ad514341d8f4f5d99d6d76daa263ffc), Justin Boffemmyer, 08/09/2008

Archive powered by MHonArc 2.6.24.

Top of Page