sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] PERFORCE change 77337 by Flavien Bridault for review
- From: Perforce Review Daemon <p4review AT smee.org>
- To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Flavien Bridault" <f.bridault AT fra.net>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
- Subject: [SM-Commit] PERFORCE change 77337 by Flavien Bridault for review
- Date: Thu, 6 Apr 2006 11:55:00 +0100 (BST)
Change 77337 by flavien_bridault@flavien-Gargamel on 2006/04/06 11:53:14
integrate in test
Affected files ...
... //sgl/grimoires/test/disk/FUNCTIONS#3 integrate
Differences ...
==== //sgl/grimoires/test/disk/FUNCTIONS#3 (xtext) ====
@@ -8,7 +8,7 @@
#---------------------------------------------------------------------
function add_module_autoload()
{
- MODULE_FILENAME=${1##*/}
+ local MODULE_FILENAME=${1##*/}
if [ ! -f $INSTALL_ROOT/etc/modules.d/$MODULE_FILENAME ]; then
mkdir -p $INSTALL_ROOT/etc/modules.d &&
@@ -37,11 +37,11 @@
#---------------------------------------------------------------------
function remove_module_autoload()
{
- MODULE_FILENAME=${1##*/}
+ local MODULE_FILENAME=${1##*/}
- MOD="$INSTALL_ROOT/etc/modules.conf"
- TMP="$INSTALL_ROOT/tmp/modules.conf"
- INC="include /etc/modules.d/$MODULE_FILENAME"
+ local MOD="$INSTALL_ROOT/etc/modules.conf"
+ local TMP="$INSTALL_ROOT/tmp/modules.conf"
+ local INC="include /etc/modules.d/$MODULE_FILENAME"
cp $MOD $TMP &&
grep -v "$INC" $TMP > $MOD &&
@@ -63,15 +63,16 @@
#---------------------------------------------------------------------
function cdr_detect()
{
- CDROM_INFO_FILE=/proc/sys/dev/cdrom/info
- CDR_MATCH_STRING="Can write CD-R:"
- CDROM_DEVICES_MATCH_STRING="drive name:"
+ local CDROM_INFO_FILE=/proc/sys/dev/cdrom/info
+ local CDR_MATCH_STRING="Can write CD-R:"
+ local CDROM_DEVICES_MATCH_STRING="drive name:"
- CDROM_DEVICES_STRING=$(grep "${CDROM_DEVICES_MATCH_STRING}"
${CDROM_INFO_FILE} | tr -d ' ' | tr -s '\t')
- CDR_STRING=$(grep "${CDR_MATCH_STRING}" ${CDROM_INFO_FILE} | tr -d ' ' |
tr -s '\t')
-
+ local CDROM_DEVICES_STRING=$(grep "${CDROM_DEVICES_MATCH_STRING}"
${CDROM_INFO_FILE} | tr -d ' ' | tr -s '\t')
+ local CDR_STRING=$(grep "${CDR_MATCH_STRING}" ${CDROM_INFO_FILE} | tr -d '
' | tr -s '\t')
+ local CD_RECORDER
+
if [ -n "${CDR_STRING}" ]; then
- NUM_CDROM_DEVICES=$(echo "${CDR_STRING}" | wc -w )
+ local NUM_CDROM_DEVICES=$(echo "${CDR_STRING}" | wc -w )
for i in $(seq 2 $NUM_CDROM_DEVICES); do
if [ $(echo "${CDR_STRING}" | cut -f$i) = 1 ]; then
- [SM-Commit] PERFORCE change 77337 by Flavien Bridault for review, Perforce Review Daemon, 04/06/2006
Archive powered by MHonArc 2.6.24.