[Modconf-commits] r167 - in trunk/modconf: . debian modules

[Frank Lichtenheld]

Author: djpig
Date: 2004-11-13 13:20:15 -0700 (Sat, 13 Nov 2004)
New Revision: 167

Modified:
   trunk/modconf/debian/changelog
   trunk/modconf/modconf
   trunk/modconf/modules/params
Log:
Fix some XSI:sms in the scripts


Modified: trunk/modconf/debian/changelog
===================================================================
--- trunk/modconf/debian/changelog	2004-10-23 23:09:53 UTC (rev 166)
+++ trunk/modconf/debian/changelog	2004-11-13 20:20:15 UTC (rev 167)
@@ -1,3 +1,10 @@
+modconf (0.2.48) unstable; urgency=low
+
+  * Fix some XSI:sms in the scripts
+  *
+
+ -- Frank Lichtenheld <djpig@debian.org>  Sat, 13 Nov 2004 20:33:30 +0100
+
 modconf (0.2.47) unstable; urgency=low
 
   * source_eval can't assume that $sed is set. Define fallback.

Modified: trunk/modconf/modconf
===================================================================
--- trunk/modconf/modconf	2004-10-23 23:09:53 UTC (rev 166)
+++ trunk/modconf/modconf	2004-11-13 20:20:15 UTC (rev 167)
@@ -18,7 +18,7 @@
 
 source_eval () {
   sed1=${sed:-sed}
-  if [ -z "$LANG" -a -z "$LC_MESSAGES" ]; then
+  if [ -z "$LANG" ] && [ -z "$LC_MESSAGES" ]; then
     . $ModuleHelpDir/eval_C
   else
     if [ -n "$LC_MESSAGES" ]; then
@@ -120,7 +120,7 @@
   echo '" " " " \' >> $TempFile
 
   for directory in $dir_descrs; do
-    if [ ! -d $Dir_Prefix/$directory -a $Source = mounted ]; then
+    if [ ! -d $Dir_Prefix/$directory ] && [ $Source = mounted ]; then
       continue;
     fi
 

Modified: trunk/modconf/modules/params
===================================================================
--- trunk/modconf/modules/params	2004-10-23 23:09:53 UTC (rev 166)
+++ trunk/modconf/modules/params	2004-11-13 20:20:15 UTC (rev 167)
@@ -29,7 +29,7 @@
     readonly sed="sed"
 fi
 
-if [ -x /bin/tempfile -o -x /usr/bin/tempfile ]; then
+if [ -x /bin/tempfile ] || [ -x /usr/bin/tempfile ]; then
     readonly TempFile=`tempfile`
     readonly TempFile1=`tempfile`
     readonly TempFile2=`tempfile`