Skip to Content.
Please activate JavaScript in your web browser
List archive
[SM-Commit] GIT changes to test cauldron by Quentin Rameau (e455b47fd4d471f56d9c7006f2d93f696f8f1bb0)
Chronological
Thread
<
Chronological
>
<
Thread
>
From
: Quentin Rameau <scm AT sourcemage.org>
To
: sm-commit AT lists.ibiblio.org
Subject
: [SM-Commit] GIT changes to test cauldron by Quentin Rameau (e455b47fd4d471f56d9c7006f2d93f696f8f1bb0)
Date
: Sun, 18 Oct 2009 14:44:24 -0500
GIT changes to test cauldron by Quentin Rameau <quinq AT sourcemage.org>:
scripts/spellcaster.sh | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit e455b47fd4d471f56d9c7006f2d93f696f8f1bb0
Author: Quentin Rameau <quinq AT sourcemage.org>
Commit: Quentin Rameau <quinq AT sourcemage.org>
scripts/spellcaster.sh: added a check in install_kernel()
Changed too generic variable name 'modules' to 'kmodules' to prevent
conflicts.
Checks that variable kmodules is not empty before testing its length.
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 1ce9561..8c9f98a 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -351,13 +351,13 @@ function install_kernel() {
# kernel config
if [[ -z $version ]]
then
- local modules="$SRC/lib/modules"
- modules="$(find "$modules" -mindepth 1 -maxdepth 1 -type d)"
- modules="$(echo "$modules" | sed 's#.*/##')"
+ local kmodules="$SRC/lib/modules"
+ kmodules="$(find "$kmodules" -mindepth 1 -maxdepth 1 -type d)"
+ kmodules="$(echo "$kmodules" | sed 's#.*/##')"
- if [[ $(echo "$modules" | wc -l) -eq 1 ]]
+ if [[ -n $kmodules && $(echo -n "$kmodules" | wc -l) -eq 1 ]]
then
- version="$modules"
+ version="$kmodules"
elif [[ -h "$SRC"/usr/src/linux ]]
then
if readlink "$SRC"/usr/src/linux
[SM-Commit] GIT changes to test cauldron by Quentin Rameau (e455b47fd4d471f56d9c7006f2d93f696f8f1bb0)
,
Quentin Rameau, 10/18/2009
Archive powered by
MHonArc 2.6.24
.