[gentoo-commits] emacs r1172 - emacs-daemon

[gentoo-commits] emacs r1172 - emacs-daemon

[Ulrich Mueller (ulm)]

Author: ulm
Date: 2008-12-07 10:44:54 +0000 (Sun, 07 Dec 2008)
New Revision: 1172

Modified:
   emacs-daemon/ChangeLog
   emacs-daemon/emacs-wrapper.sh
   emacs-daemon/emacs.rc
Log:
Determine SHELL from password file if unset.

Modified: emacs-daemon/ChangeLog
===================================================================
--- emacs-daemon/ChangeLog	2008-12-07 01:38:52 UTC (rev 1171)
+++ emacs-daemon/ChangeLog	2008-12-07 10:44:54 UTC (rev 1172)
@@ -1,3 +1,7 @@
+2008-12-07  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs.rc (start): Determine SHELL from password file if unset.
+
 2008-12-05  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-wrapper.sh: Add a timeout and kill Emacs if the daemon

Modified: emacs-daemon/emacs-wrapper.sh
===================================================================
--- emacs-daemon/emacs-wrapper.sh	2008-12-07 01:38:52 UTC (rev 1171)
+++ emacs-daemon/emacs-wrapper.sh	2008-12-07 10:44:54 UTC (rev 1172)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Start Emacs with a login shell wrapper to read the user's profile.
+# Start Emacs with a login shell wrapper to read the user's profile
 export SHELL=${SHELL:-/bin/bash}
 exec -l "${SHELL}" -c "exec \"${EMACS}\" $*" </dev/null &>/dev/null &
 pid=$!

Modified: emacs-daemon/emacs.rc
===================================================================
--- emacs-daemon/emacs.rc	2008-12-07 01:38:52 UTC (rev 1171)
+++ emacs-daemon/emacs.rc	2008-12-07 10:44:54 UTC (rev 1172)
@@ -44,6 +44,10 @@
     ebegin "Starting Emacs daemon for ${USER}"
     eval home="~${USER}"
 
+    if [ -z "${SHELL}" ]; then
+	SHELL=$(awk -F: "\$1 == \"${USER}\" { print \$7 }" /etc/passwd)
+    fi
+
     start-stop-daemon --start \
 	--user "${USER}" --chdir "${home}" --pidfile "${PIDFILE}" \
 	--env EMACS="${EMACS}" --env EMACS_TIMEOUT="${EMACS_TIMEOUT}" \