diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2007-04-26 19:02:44 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2007-04-26 19:02:44 +0000 |
| commit | 4204cd152bb857533ba626618d55890543763dce (patch) | |
| tree | aebef27f596ab21c6bdec85219ee1b5fb679590b /x11-apps | |
| parent | amd64 stable, bug 175141 (diff) | |
| download | gentoo-2-4204cd152bb857533ba626618d55890543763dce.tar.gz gentoo-2-4204cd152bb857533ba626618d55890543763dce.tar.bz2 gentoo-2-4204cd152bb857533ba626618d55890543763dce.zip | |
Move logic operations out of [ ] tests, so we have consistent syntax of the code logic.
(Portage version: 2.1.2.4)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 6 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 72908419932f..b2a27f5224ce 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.82 2007/04/25 17:50:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.83 2007/04/26 19:02:44 dberkholz Exp $ + + 26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; files/xdm.initd: + Move logic operations out of [ ] tests, so we have consistent syntax of the + code logic. 25 Apr 2007; Raúl Porcel <armin76@gentoo.org> xinit-1.0.3-r3.ebuild: Stable on ia64 wrt bug #175465 diff --git a/x11-apps/xinit/files/xdm.initd b/x11-apps/xinit/files/xdm.initd index 100f0f5f0dd3..b1e98e19068e 100755 --- a/x11-apps/xinit/files/xdm.initd +++ b/x11-apps/xinit/files/xdm.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd,v 1.4 2007/04/13 08:23:08 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd,v 1.5 2007/04/26 19:02:44 dberkholz Exp $ # This is here to serve as a note to myself, and future developers. # @@ -80,7 +80,7 @@ setup_dm() { *) EXE= # Fix #65586, where MY_XDM is empty so EXE=somedir - [ -x "/usr/bin/${MY_XDM}" -a -f "/usr/bin/${MY_XDM}" ] \ + [ -x "/usr/bin/${MY_XDM}" ] && [ -f "/usr/bin/${MY_XDM}" ] \ && EXE="/usr/bin/${MY_XDM}" [ -z "${EXE}" ] && EXE="/usr/bin/xdm" ;; @@ -90,7 +90,7 @@ setup_dm() { } cmdline_opt() { - if [ $# -ne 1 -o ! -r /proc/cmdline ]; then + if [ $# -ne 1 ] || ! [ -r /proc/cmdline ]; then return 1 fi @@ -116,7 +116,7 @@ start() { # Start as soon as possible if XSTATICVT is set # or if we don't have telinit (as on BSD) - if [ "${XSTATICVT}" = "yes" -o ! -x /sbin/telinit ] ; then + if [ "${XSTATICVT}" = "yes" ] || ! [ -x /sbin/telinit ] ; then /etc/X11/startDM.sh else #tell init to run /etc/X11/startDM.sh after current |