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

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



Author: branden
Date: 2004-02-23 17:53:52 -0500 (Mon, 23 Feb 2004)
New Revision: 1103

Modified:
   trunk/debian/xserver-xfree86.bug
Log:
Improve the esthetics of the information reported by adding descriptive
headers and blank lines.

Report the contents of the most recent XFree86 X server log file, not the
least recent one.


Modified: trunk/debian/xserver-xfree86.bug
===================================================================
--- trunk/debian/xserver-xfree86.bug	2004-02-23 22:23:38 UTC (rev 1102)
+++ trunk/debian/xserver-xfree86.bug	2004-02-23 22:53:52 UTC (rev 1103)
@@ -15,12 +15,14 @@
 if [ -e "$SERVER_SYMLINK_ROSTER" ]; then
     printf "Contents of $SERVER_SYMLINK_ROSTER:\n" >&3
     cat "$SERVER_SYMLINK_ROSTER" >&3
-    printf "\n" >&3
 else
     printf "$SERVER_SYMLINK_ROSTER does not exist.\n" >&3
 fi
 
+printf "\n" >&3
+
 if [ -e "$SERVER_SYMLINK" ]; then
+    printf "X server symlink status:\n" >&3
     ls -dl "$SERVER_SYMLINK" >&3
     ls -dl "$(readlink "$SERVER_SYMLINK")" >&3
     if [ -e "$SERVER_SYMLINK_CHECKSUM" ]; then
@@ -47,24 +49,31 @@
     printf "$SERVER_SYMLINK is not executable.\n" >&3
 fi
 
+printf "\n" >&3
+
 if [ -e "$XF86CONFIG_ROSTER" ]; then
     printf "Contents of $XF86CONFIG_ROSTER:\n" >&3
     cat "$XF86CONFIG_ROSTER" >&3
-    printf "\n" >&3
 else
     printf "$XF86CONFIG_ROSTER does not exist.\n" >&3
 fi
 
+printf "\n" >&3
+
 if which lspci > /dev/null 2>&1; then
+    printf "VGA-compatible devices on PCI bus:\n" >&3
     LC_ALL=C lspci | grep 'VGA compatible controller:' >&3
     LC_ALL=C lspci -n | grep 'Class 0300:' >&3
-    printf "\n" >&3
 else
     printf "The lspci command was not found; not including PCI data.\n" >&3
 fi
 
+printf "\n" >&3
+
 if [ -e "$XF86CONFIG" ]; then
+    printf "XFree86 X server configuration file status:\n" >&3
     ls -dl "$XF86CONFIG" >&3
+    printf "\n" >&3
     printf "Contents of $XF86CONFIG:\n" >&3
     cat "$XF86CONFIG" >&3
     printf "\n" >&3
@@ -83,23 +92,27 @@
     printf "$XF86CONFIG does not exist.\n" >&3
 fi
 
-XFREE86_LOGS=$(ls -drt /var/log/XFree86.*.log 2>/dev/null)
+printf "\n" >&3
 
+XFREE86_LOGS=$(ls -dt /var/log/XFree86.*.log 2>/dev/null)
+
 if [ -n "$XFREE86_LOGS" ]; then
     for LOG in $XFREE86_LOGS; do
         if [ -f "$LOG" ]; then
             printf "Contents of most recent XFree86 X server log file\n" >&3
             printf "%s:\n" "$LOG" >&3
             cat "$LOG" >&3
-            printf "\n" >&3
             # the log files are large; only show the most recent
             break
         fi
     done
+    printf "\n" >&3
     printf "XFree86 X server log files on system:\n" >&3
     ls -dlrt /var/log/XFree86.*.log >&3 2>/dev/null
 else
     printf "No XFree86 X server log files found.\n" >&3
 fi
 
+printf "\n" >&3
+
 # vim:set ai et sts=4 sw=4 tw=0:



Reply to: