Move logic operations out of [ ] tests, so we have consistent syntax of the code...

Package-Manager: portage-2.1.2.4

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 72908419932fcd643c25dec7846250b37679aa65..b2a27f5224ce587c5277e55ffa0e48422e669faa 100644 (file)
--- 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/Manifest b/x11-apps/xinit/Manifest
index 4144cd3065988076c8a25fc5978eb9975060d0d6..32dd669b565911916aeac2c1cf9afade3098d224 100644 (file)
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -22,10 +22,10 @@ AUX xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 SHA1 57e33bae4
 MD5 1ef321642c38bfb020e92723722319fb files/xdm.confd 668
 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 files/xdm.confd 668
 SHA256 d8b6828dae11bd2e632c9000b087d59c66192e1e21183124e7bf90ddee09f128 files/xdm.confd 668
-AUX xdm.initd 4645 RMD160 16121dfbbd7057bd59f22f86f265fcc1dc9782ca SHA1 fa6c6ab8e8331b01698e0d6f58f71644de5f3495 SHA256 a99cb3c5bb2fed770ff60677a627f55871e47c362a1684a7c1c3613efb814cbb
-MD5 4da011f47d25411729838fffa34f07fd files/xdm.initd 4645
-RMD160 16121dfbbd7057bd59f22f86f265fcc1dc9782ca files/xdm.initd 4645
-SHA256 a99cb3c5bb2fed770ff60677a627f55871e47c362a1684a7c1c3613efb814cbb files/xdm.initd 4645
+AUX xdm.initd 4658 RMD160 c9b1269ffede498cd6cedd8f0adf1e458133e40b SHA1 52e366698ddc8f77bc828e2994b744dc441b489e SHA256 4f3c7a331bd3d09abac14b5a08ae9e451d5e8eb019e05b1d1990a4e8bd54bbcf
+MD5 035d2632f2049efc46be2023c1e6fe0d files/xdm.initd 4658
+RMD160 c9b1269ffede498cd6cedd8f0adf1e458133e40b files/xdm.initd 4658
+SHA256 4f3c7a331bd3d09abac14b5a08ae9e451d5e8eb019e05b1d1990a4e8bd54bbcf files/xdm.initd 4658
 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded
 MD5 5dd1b14c1942c59025be5fa7d470f281 files/xdm.start 3974
 RMD160 67f3b69fc9c006146999271935e1ae06d093130a files/xdm.start 3974
@@ -60,10 +60,10 @@ EBUILD xinit-1.0.3.ebuild 1336 RMD160 4395f36048cc77b18430f512172cb11340a942e4 S
 MD5 24a82969244654b6d5f3c7fbf05b102b xinit-1.0.3.ebuild 1336
 RMD160 4395f36048cc77b18430f512172cb11340a942e4 xinit-1.0.3.ebuild 1336
 SHA256 aea3003858e5cec5d12e116e9a20496662c9d443193ca10a46d568b9af663c99 xinit-1.0.3.ebuild 1336
-MISC ChangeLog 13331 RMD160 012cc89848c492ae7616b625bad40cc574df5248 SHA1 b653d5f06310f86eac7a51b612693ca129c11171 SHA256 0e8aa44975019ea8262ee022dd894667d554b84f5eba0d8555667f79064614f1
-MD5 6e39c2e9daa4ed538879535f9965fd2e ChangeLog 13331
-RMD160 012cc89848c492ae7616b625bad40cc574df5248 ChangeLog 13331
-SHA256 0e8aa44975019ea8262ee022dd894667d554b84f5eba0d8555667f79064614f1 ChangeLog 13331
+MISC ChangeLog 13498 RMD160 98fa476297dca0f3c4edf69e503aba2c043d298b SHA1 913f91357d10daae5c8e4544012a4a48848aaaa3 SHA256 3b9229c72a8c1113f41c5ad34f037afb6486782003ddf4352e64e42df91a80d5
+MD5 99f2239f3ea4b1b67b510349b94cae24 ChangeLog 13498
+RMD160 98fa476297dca0f3c4edf69e503aba2c043d298b ChangeLog 13498
+SHA256 3b9229c72a8c1113f41c5ad34f037afb6486782003ddf4352e64e42df91a80d5 ChangeLog 13498
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156

diff --git a/x11-apps/xinit/files/xdm.initd b/x11-apps/xinit/files/xdm.initd
index 100f0f5f0dd327abeb48d2738779a207b877a330..b1e98e19068ea541e3b5cf4c693f0d4a889e012b 100755 (executable)
--- 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