| 1 |
On 23:48 Thu 24 Mar , Christoph Mende wrote: |
| 2 |
> Index: mono.eclass |
| 3 |
> =================================================================== |
| 4 |
> RCS file: /var/cvsroot/gentoo-x86/eclass/mono.eclass,v |
| 5 |
> retrieving revision 1.13 |
| 6 |
> diff -u -b -B -r1.13 mono.eclass |
| 7 |
> --- mono.eclass 8 Mar 2009 15:46:54 -0000 1.13 |
| 8 |
> +++ mono.eclass 24 Mar 2011 22:47:08 -0000 |
| 9 |
> @@ -35,24 +35,26 @@ |
| 10 |
> unset MONO_AOT_CACHE |
| 11 |
> |
| 12 |
> egacinstall() { |
| 13 |
> + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ |
| 14 |
> gacutil -i "${1}" \ |
| 15 |
> - -root "${D}"/usr/$(get_libdir) \ |
| 16 |
> + -root "${ED}"/usr/$(get_libdir) \ |
| 17 |
> -gacdir /usr/$(get_libdir) \ |
| 18 |
> -package ${2:-${GACPN:-${PN}}} \ |
| 19 |
> || die "installing ${1} into the Global Assembly Cache failed" |
| 20 |
> } |
| 21 |
> |
| 22 |
> mono_multilib_comply() { |
| 23 |
> + [[ -z ${ED+set} ]] && local ED=${D%/}${EPREFIX}/ |
| 24 |
> local dir finddirs=() mv_command=${mv_command:-mv} |
| 25 |
> - if [[ -d "${D}/usr/lib" && "$(get_libdir)" != "lib" ]] |
| 26 |
> + if [[ -d "${ED}/usr/lib" && "$(get_libdir)" != "lib" ]] |
| 27 |
|
| 28 |
No need for quotes when expanding variables or functions inside [[ ]]. |
| 29 |
That holds true for the rest of the diff, too. I'd also split this (and |
| 30 |
a later find call) into two separate conditionals, with just one test |
| 31 |
per [[ ]]. |
| 32 |
|
| 33 |
-- |
| 34 |
Thanks, |
| 35 |
Donnie |
| 36 |
|
| 37 |
Donnie Berkholz |
| 38 |
Sr. Developer, Gentoo Linux |
| 39 |
Blog: http://dberkholz.com |
Archives