diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2006-04-20 05:30:14 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2006-04-20 05:30:14 +0000 |
| commit | 6fc2613a0904c06725c4ae3dbbc7e76a2db96f04 (patch) | |
| tree | d134ea7f0ffaa994894b557fde79276a00c524b4 /x11-apps | |
| parent | Version bump for 4.4_beta1. (diff) | |
| download | gentoo-2-6fc2613a0904c06725c4ae3dbbc7e76a2db96f04.tar.gz gentoo-2-6fc2613a0904c06725c4ae3dbbc7e76a2db96f04.tar.bz2 gentoo-2-6fc2613a0904c06725c4ae3dbbc7e76a2db96f04.zip | |
(#62086) Allow ~/.xinitrc to be an executable file of any type, not just a /bin/sh script (Carlo von Loesch).
(Portage version: 2.1_pre7-r5)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-apps/xinit/files/digest-xinit-1.0.2-r1 (renamed from x11-apps/xinit/files/digest-xinit-1.0.2) | 0 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xinitrc | 9 | ||||
| -rw-r--r-- | x11-apps/xinit/xinit-1.0.2-r1.ebuild (renamed from x11-apps/xinit/xinit-1.0.2.ebuild) | 2 |
4 files changed, 17 insertions, 3 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 205641a02755..b7b140b5b173 100644 --- a/x11-apps/xinit/ChangeLog +++ b/x11-apps/xinit/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-apps/xinit # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.41 2006/04/08 21:02:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.42 2006/04/20 05:30:14 spyderous Exp $ + +*xinit-1.0.2-r1 (20 Apr 2006) + + 20 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; files/xinitrc, + -xinit-1.0.2.ebuild, +xinit-1.0.2-r1.ebuild: + (#62086) Allow ~/.xinitrc to be an executable file of any type, not just a + /bin/sh script (Carlo von Loesch). 08 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>; -xinit-1.0.1.ebuild: Pull old ebuild. diff --git a/x11-apps/xinit/files/digest-xinit-1.0.2 b/x11-apps/xinit/files/digest-xinit-1.0.2-r1 index 29ec40dd3a6d..29ec40dd3a6d 100644 --- a/x11-apps/xinit/files/digest-xinit-1.0.2 +++ b/x11-apps/xinit/files/digest-xinit-1.0.2-r1 diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc index f2ba1d79626b..bcc80b19c348 100644 --- a/x11-apps/xinit/files/xinitrc +++ b/x11-apps/xinit/files/xinitrc @@ -28,7 +28,14 @@ fi # First try ~/.xinitrc if [ -f "$HOME/.xinitrc" ]; then XINITRC="$HOME/.xinitrc" - exec /bin/sh "$HOME/.xinitrc" + if [ -e $XINITRC ]; then + # if the x bit is set on .xinitrc + # it means the xinitrc is not a + # shell script but something else + exec $XINITRC + else + exec /bin/sh "$HOME/.xinitrc" + fi # If not present, try the system default elif [ -n "`/etc/X11/chooser.sh`" ]; then exec "`/etc/X11/chooser.sh`" diff --git a/x11-apps/xinit/xinit-1.0.2.ebuild b/x11-apps/xinit/xinit-1.0.2-r1.ebuild index 8bae4c7fdece..2f870f40c83f 100644 --- a/x11-apps/xinit/xinit-1.0.2.ebuild +++ b/x11-apps/xinit/xinit-1.0.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2.ebuild,v 1.1 2006/04/04 00:52:21 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.0.2-r1.ebuild,v 1.1 2006/04/20 05:30:14 spyderous Exp $ # Must be before x-modular eclass is inherited # This is enabled due to modified Makefile.am from the patches |