[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: r1729 - trunk/debian



Author: branden
Date: 2004-08-11 01:00:57 -0500 (Wed, 11 Aug 2004)
New Revision: 1729

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/xserver-xfree86.config.in
Log:
(cosmetic) Fix shell style.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2004-08-11 05:58:13 UTC (rev 1728)
+++ trunk/debian/CHANGESETS	2004-08-11 06:00:57 UTC (rev 1729)
@@ -261,7 +261,7 @@
 Fix bug in xserver-xfree86 configuration script where failure of
 autodetection would cause the script to think it had detected one X server
 or XFree86 video driver instead ($(echo "" | wc -l) is "1", not "0").
-    1720, 1728
+    1720, 1728, 1729
 
 Tighten regex in patch-audit rule so messages like "patching file
 xc/doc/man/Xt/XtOffset.man" are not false positives.

Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in	2004-08-11 05:58:13 UTC (rev 1728)
+++ trunk/debian/xserver-xfree86.config.in	2004-08-11 06:00:57 UTC (rev 1729)
@@ -520,9 +520,13 @@
   if [ -n "$DISCOVERED_VIDEO" ]; then
     NCARDS=$(echo "$DISCOVERED_VIDEO" | wc -l)
     SERVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $2}' | grep -v unknown | sort | uniq)
-    if [ -n "$SERVERS" ]; then NSERVERS=$(echo "$SERVERS" | wc -l); fi
+    if [ -n "$SERVERS" ]; then
+      NSERVERS=$(echo "$SERVERS" | wc -l)
+    fi
     DRIVERS=$(echo "$DISCOVERED_VIDEO" | awk 'BEGIN { FS="\t" } {print $NF}' | grep -v unknown | sort | uniq)
-    if [ -n "$DRIVERS" ]; then NDRIVERS=$(echo "$DRIVERS" | wc -l); fi
+    if [ -n "$DRIVERS" ]; then
+      NDRIVERS=$(echo "$DRIVERS" | wc -l)
+    fi
     if [ $NCARDS -gt 1 ]; then
       MULTIHEAD=yes
     fi



Reply to: