summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
authorTilman Sauerbeck <tilman@code-monkey.de>2007-09-17 08:27:23 +0200
committerTilman Sauerbeck <tilman@code-monkey.de>2007-09-17 08:27:39 +0200
commit52121e9de907c61a16e41f0f08acecc1dc1546e5 (patch)
tree0801b5d7d278fdb1b0d177044f6ddfa36402fada /startx.cpp
parentff9752bc4304e5a29ef7e06b56bd4e0e5ca32926 (diff)
downloadxorg-app-xinit-52121e9de907c61a16e41f0f08acecc1dc1546e5.tar.gz
Bug #12448: Don't try to trap 'ERR'.
startx is advertised as a POSIX sh script. These shells don't necessarily support trapping 'ERR'. This makes startx work again with dash (and probably others).
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/startx.cpp b/startx.cpp
index a9b4199..81e776f 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -198,7 +198,7 @@ dummy=0
XCOMM create a file with auth information for the server. ':0' is a dummy.
xserverauthfile=$HOME/.serverauth.$$
-trap "rm -f $xserverauthfile" ERR HUP INT QUIT ILL TRAP KILL BUS TERM
+trap "rm -f $xserverauthfile" HUP INT QUIT ILL TRAP KILL BUS TERM
xauth -q -f $xserverauthfile << EOF
add :$dummy . $mcookie
EOF