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

IMPORNTANT FIX: Having weird X problems? Wheel mouse or xterm keys not working right?



Okay, okay, half a dozen bug reports about this is enough.  The reading in of X
resource files got broken in 3.3.6-7.  Sorry.  And I offer an apology to Lars
Wirzenius.  Yes, sometimes the damnedest things DO happen... :)

Please stop filing bugs about this.  I know about the problem and the fix is
in place for -8.

For those of you who can't wait, here it is.  (Also MIME-attached.)

--- /etc/X11/Xsession.broken   Mon May 29 23:54:52 2000
+++ /etc/X11/Xsession     Wed May 31 01:21:01 2000
@@ -78,11 +78,13 @@
 esac
 
 if [ -d $sysresources ]; then
-  if [ "$(echo $sysresources/*)" != "$sysresources/*" ]; then
-    for resourcefile in $(echo $sysresources/* 2> /dev/null | egrep '^[-/_[:alnum:]]*$'); do
-      xrdb -merge $resourcefile
-    done
-  fi
+  for resourcefile in $sysresources/*; do
+    if [ -f $resourcefile ]; then
+      if expr $resourcefile : '.*/[:alnum:_-]*' > /dev/null 2>&1; then
+        xrdb -merge $resourcefile
+      fi
+    fi
+  done
 fi
 
 if [ -x /usr/bin/X11/xmodmap ]; then

-- 
G. Branden Robinson            |
Debian GNU/Linux               |       Music is the brandy of the damned.
branden@ecn.purdue.edu         |       -- George Bernard Shaw
roger.ecn.purdue.edu/~branden/ |
--- /etc/X11/Xsession	Mon May 29 23:54:52 2000
+++ xfree86-common/Xsession	Wed May 31 01:21:01 2000
@@ -78,11 +78,13 @@
 esac
 
 if [ -d $sysresources ]; then
-  if [ "$(echo $sysresources/*)" != "$sysresources/*" ]; then
-    for resourcefile in $(echo $sysresources/* 2> /dev/null | egrep '^[-/_[:alnum:]]*$'); do
-      xrdb -merge $resourcefile
-    done
-  fi
+  for resourcefile in $sysresources/*; do
+    if [ -f $resourcefile ]; then
+      if expr $resourcefile : '.*/[:alnum:_-]*' > /dev/null 2>&1; then
+        xrdb -merge $resourcefile
+      fi
+    fi
+  done
 fi
 
 if [ -x /usr/bin/X11/xmodmap ]; then

Attachment: pgpA7fM9oA0sV.pgp
Description: PGP signature


Reply to: