Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (1f7451dd786ddb2b8c28f5229198e60df2fab9a4)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (1f7451dd786ddb2b8c28f5229198e60df2fab9a4)
  • Date: Fri, 2 Feb 2007 07:35:43 -0600

GIT changes to master z-rejected grimoire by Juuso Alasuutari
<iuso AT sourcemage.org>:

z-kernels/nvidia_driver/HISTORY | 1 +
z-kernels/nvidia_driver/PREPARE | 15 +++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit 1f7451dd786ddb2b8c28f5229198e60df2fab9a4
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

nvidia_driver: changed license conditional to remember previous answer
better

diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index db78595..d00f0be 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -2,6 +2,7 @@
* INSTALL: Install libnvidia-wfb.so (bug #13484).
* DETAILS: PATCHLEVEL=1
* UNATTEND_SAFE: Added.
+ * PREPARE: Minor fix to license prompting conditional.

2006-12-27 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 1.0-9746
diff --git a/z-kernels/nvidia_driver/PREPARE b/z-kernels/nvidia_driver/PREPARE
index dd9de89..6342a1e 100755
--- a/z-kernels/nvidia_driver/PREPARE
+++ b/z-kernels/nvidia_driver/PREPARE
@@ -1,11 +1,14 @@
-. $GRIMOIRE/REJECTED_MSG &&
+. "$GRIMOIRE/REJECTED_MSG" &&

-if ! spell_ok $SPELL; then
- cat $SCRIPT_DIRECTORY/LICENSE &&
+if [[ $LEGAL == y ]] || ([[ -z $LEGAL ]] && spell_ok $SPELL)
+then
+ message "${MESSAGE_COLOR}License has been accepted before," \
+ "continuing without interrupt.${DEFAULT_COLOR}"
+else
+ cat "$SCRIPT_DIRECTORY/LICENSE" &&
config_query LEGAL "Accept license agreement?" n &&
- if [[ $LEGAL != y ]]; then
+ if [[ $LEGAL != y ]]
+ then
return 1
fi
-else
- message "${MESSAGE_COLOR}Spell already installed, assuming license as
accepted.${DEFAULT_COLOR}"
fi



  • [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (1f7451dd786ddb2b8c28f5229198e60df2fab9a4), Juuso Alasuutari, 02/02/2007

Archive powered by MHonArc 2.6.24.

Top of Page