1 |
vapier 08/05/31 06:57:52 |
2 |
|
3 |
Modified: ChangeLog bash-3.2_p39.ebuild |
4 |
Log: |
5 |
Make sure /bin/sh always exists #222721 by Davide Pesavento. |
6 |
(Portage version: 2.2_pre5.spank.spunk) |
7 |
|
8 |
Revision Changes Path |
9 |
1.178 app-shells/bash/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.178&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?rev=1.178&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/ChangeLog?r1=1.177&r2=1.178 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v |
18 |
retrieving revision 1.177 |
19 |
retrieving revision 1.178 |
20 |
diff -u -r1.177 -r1.178 |
21 |
--- ChangeLog 17 May 2008 09:02:36 -0000 1.177 |
22 |
+++ ChangeLog 31 May 2008 06:57:52 -0000 1.178 |
23 |
@@ -1,6 +1,9 @@ |
24 |
# ChangeLog for app-shells/bash |
25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.177 2008/05/17 09:02:36 dberkholz Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/ChangeLog,v 1.178 2008/05/31 06:57:52 vapier Exp $ |
28 |
+ |
29 |
+ 31 May 2008; Mike Frysinger <vapier@g.o> bash-3.2_p39.ebuild: |
30 |
+ Make sure /bin/sh always exists #222721 by Davide Pesavento. |
31 |
|
32 |
17 May 2008; Donnie Berkholz <dberkholz@g.o>; bash-3.2_p39.ebuild: |
33 |
(222211) Install examples with USE=examples. Approved by vapier. |
34 |
|
35 |
|
36 |
|
37 |
1.4 app-shells/bash/bash-3.2_p39.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.4&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?rev=1.4&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild?r1=1.3&r2=1.4 |
42 |
|
43 |
Index: bash-3.2_p39.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v |
46 |
retrieving revision 1.3 |
47 |
retrieving revision 1.4 |
48 |
diff -u -r1.3 -r1.4 |
49 |
--- bash-3.2_p39.ebuild 17 May 2008 09:02:36 -0000 1.3 |
50 |
+++ bash-3.2_p39.ebuild 31 May 2008 06:57:52 -0000 1.4 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2008 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.3 2008/05/17 09:02:36 dberkholz Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash/bash-3.2_p39.ebuild,v 1.4 2008/05/31 06:57:52 vapier Exp $ |
56 |
|
57 |
inherit eutils flag-o-matic toolchain-funcs multilib |
58 |
|
59 |
@@ -182,14 +182,9 @@ |
60 |
if [[ -e ${ROOT}/etc/bash/bash_logout ]] ; then |
61 |
rm -f "${D}"/etc/bash/bash_logout |
62 |
fi |
63 |
+} |
64 |
|
65 |
- # If /bin/sh does not exist or is bash, then provide it |
66 |
- # Otherwise leave it alone |
67 |
- if [[ ! -e ${ROOT}/bin/sh ]] ; then |
68 |
- ln -s bash "${ROOT}"/bin/sh |
69 |
- elif [[ -L ${ROOT}/bin/sh ]] ; then |
70 |
- case $(readlink "${ROOT}"/bin/sh) in |
71 |
- bash|/bin/bash) cp -pPR "${ROOT}"/bin/sh "${D}"/bin/ ;; |
72 |
- esac |
73 |
- fi |
74 |
+pkg_postinst() { |
75 |
+ # If /bin/sh does not exist, provide it |
76 |
+ [[ ! -e ${ROOT}/bin/sh ]] && ln -sf bash "${ROOT}"/bin/sh |
77 |
} |
78 |
|
79 |
|
80 |
|
81 |
-- |
82 |
gentoo-commits@l.g.o mailing list |