/[gentoo-x86]/eclass/ruby-ng.eclass
Gentoo

Diff of /eclass/ruby-ng.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.57 Revision 1.58
1# Copyright 1999-2015 Gentoo Foundation 1# Copyright 1999-2015 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.57 2015/05/31 05:57:23 graaff Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.58 2015/06/29 11:01:31 mrueg Exp $
4 4
5# @ECLASS: ruby-ng.eclass 5# @ECLASS: ruby-ng.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# Ruby herd <ruby@gentoo.org> 7# Ruby herd <ruby@gentoo.org>
8# @AUTHOR: 8# @AUTHOR:
300 300
301_ruby_invoke_environment() { 301_ruby_invoke_environment() {
302 old_S=${S} 302 old_S=${S}
303 case ${EAPI} in 303 case ${EAPI} in
304 4|5) 304 4|5)
305 if [ -z ${RUBY_S} ]; then 305 if [ -z "${RUBY_S}" ]; then
306 sub_S=${P} 306 sub_S=${P}
307 else 307 else
308 sub_S=${RUBY_S} 308 sub_S=${RUBY_S}
309 fi 309 fi
310 ;; 310 ;;
314 esac 314 esac
315 315
316 # Special case, for the always-lovely GitHub fetches. With this, 316 # Special case, for the always-lovely GitHub fetches. With this,
317 # we allow the star glob to just expand to whatever directory it's 317 # we allow the star glob to just expand to whatever directory it's
318 # called. 318 # called.
319 if [[ ${sub_S} = *"*"* ]]; then 319 if [[ "${sub_S}" = *"*"* ]]; then
320 case ${EAPI} in 320 case ${EAPI} in
321 2|3) 321 2|3)
322 #The old method of setting S depends on undefined package 322 #The old method of setting S depends on undefined package
323 # manager behaviour, so encourage upgrading to EAPI=4. 323 # manager behaviour, so encourage upgrading to EAPI=4.
324 eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead." 324 eqawarn "Using * expansion of S is deprecated. Use EAPI and RUBY_S instead."
325 ;; 325 ;;
326 esac 326 esac
327 pushd "${WORKDIR}"/all &>/dev/null 327 pushd "${WORKDIR}"/all &>/dev/null
328 sub_S=$(eval ls -d ${sub_S} 2>/dev/null) 328 sub_S=$(eval ls -d "${sub_S}" 2>/dev/null)
329 popd &>/dev/null 329 popd &>/dev/null
330 fi 330 fi
331 331
332 environment=$1; shift 332 environment=$1; shift
333 333

Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58

  ViewVC Help
Powered by ViewVC 1.1.20