Work better with non bash shells.

Package-Manager: portage-2.1.2.2

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index c99ff72f128474fb7a679c5c15dcfbcfa9111135..aacc0cfcb5ac999750c35688d746d142d064d4ee 100644 (file)
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.76 2007/03/04 16:28:36 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.77 2007/03/11 02:01:24 uberlord Exp $
+
+  11 Mar 2007; Roy Marples <uberlord@gentoo.org> files/startDM.sh:
+  Work better with non bash shells.
 
   04 Mar 2007; Joshua Baergen <joshuabaergen@gentoo.org>
   xinit-1.0.2-r6.ebuild, xinit-1.0.3.ebuild, xinit-1.0.3-r1.ebuild:

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 45763c70af9c6f61eb67635b50a66019ee3f2aa2..23540af2e1751dcc28832bbbab7a16b9ceabf8a6 100644 (file)
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -14,10 +14,10 @@ AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71
 MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 files/nolisten-tcp-and-black-background.patch 381
 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826 files/nolisten-tcp-and-black-background.patch 381
-AUX startDM.sh 922 RMD160 9b3a6f6a7865df8dab058b596ed4a08a4aa73466 SHA1 84a67e9483c1284165941d7675f261ea56d70213 SHA256 6a4fd3d42d93bf2069cb1bbc41998896e8d21af1918764bb926d3bdd86abe806
-MD5 9b8e28dcd50f1b53ee101f4d2f67e987 files/startDM.sh 922
-RMD160 9b3a6f6a7865df8dab058b596ed4a08a4aa73466 files/startDM.sh 922
-SHA256 6a4fd3d42d93bf2069cb1bbc41998896e8d21af1918764bb926d3bdd86abe806 files/startDM.sh 922
+AUX startDM.sh 790 RMD160 2cc4b6a5db871bb547d7e4b12eaa5eb9cc3adadb SHA1 3cbc0434c0279397d8722988fd57b060999c3500 SHA256 73a59da800e0c6087173dad56ec6ec1f3ad27b31751f2a694b71dd629dfd9b73
+MD5 e95ffb0d833d4c378e3e40ecaaa8c886 files/startDM.sh 790
+RMD160 2cc4b6a5db871bb547d7e4b12eaa5eb9cc3adadb files/startDM.sh 790
+SHA256 73a59da800e0c6087173dad56ec6ec1f3ad27b31751f2a694b71dd629dfd9b73 files/startDM.sh 790
 AUX xdm.confd 668 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 SHA1 57e33bae408f1ae3d41169dfc83fcfca91df6083 SHA256 d8b6828dae11bd2e632c9000b087d59c66192e1e21183124e7bf90ddee09f128
 MD5 1ef321642c38bfb020e92723722319fb files/xdm.confd 668
 RMD160 336b367da62beb39bcf4ce60efc07c7c00dc7133 files/xdm.confd 668
@@ -56,10 +56,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 12445 RMD160 0276dd8af72886947a2f2a1707ceb26c77c56ffb SHA1 79be4d164a5f46d4513387c0cb7a1e521cfb04ff SHA256 45e66a6756fd34fc926753390f178926bb923b6c044315e5de94458a94e33ab3
-MD5 8d89d232cdeb70a166507d7a03a9fa40 ChangeLog 12445
-RMD160 0276dd8af72886947a2f2a1707ceb26c77c56ffb ChangeLog 12445
-SHA256 45e66a6756fd34fc926753390f178926bb923b6c044315e5de94458a94e33ab3 ChangeLog 12445
+MISC ChangeLog 12544 RMD160 dcbbae57c9e380ba51d10ee378b001406a8fa1cd SHA1 c93c2c901bc0a46e9fcb437d8892c4f4edc2acf5 SHA256 545c648f380fcddca8d33d32bbe8e7b9c0769c84778efde80f523773cd2f8228
+MD5 1f158c348cf30aa4a04c9cf6ccbaa42e ChangeLog 12544
+RMD160 dcbbae57c9e380ba51d10ee378b001406a8fa1cd ChangeLog 12544
+SHA256 545c648f380fcddca8d33d32bbe8e7b9c0769c84778efde80f523773cd2f8228 ChangeLog 12544
 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/startDM.sh b/x11-apps/xinit/files/startDM.sh
index f308271a114602b4aa4bd03bf99e23495710316c..d2132348372d8e18e76645a13c2d6c7d503c669c 100644 (file)
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,35 +1,28 @@
-#!/bin/bash
+#!/bin/sh
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.2 2006/07/01 00:48:30 vapier Exp $
-#
-# Author: Martin Schlemmer <azarah@gentoo.org>
-
-source /etc/init.d/functions.sh
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.3 2007/03/11 02:01:24 uberlord Exp $
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
-source /etc/profile
+. /etc/profile
+
+. /etc/init.d/functions.sh
+
+# baselayout-1 compat
+if ! type get_options >/dev/null 2>/dev/null ; then
+       [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
+fi
 
 # Great new Gnome2 feature, AA
 # We enable this by default
 export GDK_USE_XFT=1
 
-if [[ -e ${svcdir}/options/xdm/service ]] ; then
-       retval=0
-       EXE=$(<"${svcdir}"/options/xdm/service)
-
-       /sbin/start-stop-daemon --start --quiet --exec ${EXE}
-       retval=$?
-       # Fix bug #26125 for slower systems
-       wait; sleep 2
+export SVCNAME=xdm
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
 
-       if [[ ${retval} -ne 0 ]] ; then
-               # there was a error running the DM
-               einfo "ERROR: could not start the Display Manager..."
-               # make sure we do not have a misbehaving DM
-               killall -9 ${EXE##*/}
-       fi
-fi
+start-stop-daemon --start --exec ${EXEC} ${NAME:+--name }${NAME} || \
+eerror "ERROR: could not start the Display Manager"
 
 # vim:ts=4