diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-12-08 16:09:50 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-12-08 16:09:50 +0000 |
| commit | 81ecd7acd8f01d999dae55c6945dfd972bab3124 (patch) | |
| tree | d1ce2fa936c48f77be194fe67824515b5a9dea6d /data/Init.in | |
| parent | ad7e0b422b31a7b000017591b4987fc45e1d5616 (diff) | |
| download | gdm-81ecd7acd8f01d999dae55c6945dfd972bab3124.tar.gz | |
gut functions, since they were redundant with what we do in code now (bug
2008-12-08 Ray Strode <rstrode@redhat.com>
* data/{PreSession,PostSession}.in:
gut functions, since they were redundant
with what we do in code now (bug 563550)
* data/Init.in:
apply patch from Pacho Ramos to quote
shell conditionals better (bug 563550).
svn path=/trunk/; revision=6625
Diffstat (limited to 'data/Init.in')
| -rw-r--r-- | data/Init.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/Init.in b/data/Init.in index 16ba078b..091f5351 100644 --- a/data/Init.in +++ b/data/Init.in @@ -32,8 +32,8 @@ fi sysmodmap=/etc/X11/Xmodmap XMODMAP=`gdmwhich xmodmap` -if [ x$XMODMAP != x ] ; then - if [ x$GDM_PARENT_DISPLAY = x ]; then +if [ "x$XMODMAP" != "x" ] ; then + if [ "x$GDM_PARENT_DISPLAY" = "x" ]; then if [ -f $sysmodmap ]; then $XMODMAP $sysmodmap fi @@ -47,7 +47,7 @@ if [ x$XMODMAP != x ] ; then UNAME=`gdmwhich uname` PROCESSOR=`$UNAME -p` - if [ x$PROCESSOR = xsparc ]; then + if [ "x$PROCESSOR" = "xsparc" ]; then if $XMODMAP | /usr/bin/grep mod4 | /usr/bin/grep Alt > /dev/null 2>/dev/null then $XMODMAP -e "clear Mod1" \ @@ -61,7 +61,7 @@ if [ x$XMODMAP != x ] ; then fi SETXKBMAP=`gdmwhich setxkbmap` -if [ x$SETXKBMAP != x ] ; then +if [ "x$SETXKBMAP" != "x" ] ; then # FIXME: is this all right? Is this completely on crack? # What this does is move the xkb configuration from the GDM_PARENT_DISPLAY # FIXME: This should be done in code. Or there must be an easier way ... |