Re: [gentoo-portage-dev] [PATCH 02/10] Use bash-4.2 for all future EAPIs, until declared otherwise

2018-02-26 Thread Michał Górny
W dniu pon, 26.02.2018 o godzinie 16∶59 +0100, użytkownik Michał Górny
napisał:
> ---
>  bin/eapi.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/bin/eapi.sh b/bin/eapi.sh
> index a9c56b8ac..f3ba0da6e 100644
> --- a/bin/eapi.sh
> +++ b/bin/eapi.sh
> @@ -1,5 +1,5 @@
>  #!/bin/bash
> -# Copyright 2012 Gentoo Foundation
> +# Copyright 2012-2018 Gentoo Foundation
>  # Distributed under the terms of the GNU General Public License v2
>  
>  # PHASES
> @@ -193,5 +193,5 @@ ___eapi_bash_3_2() {
>  }
>  
>  ___eapi_bash_4_2() {
> - [[ ${1-${EAPI-0}} =~ ^(6)$ ]]
> + ! ___eapi_bash_3_2

I've updated this to:

+   ! ___eapi_bash_3_2 "$@"


Courtesy of Arfrever.

>  }

-- 
Best regards,
Michał Górny




[gentoo-portage-dev] [PATCH 02/10] Use bash-4.2 for all future EAPIs, until declared otherwise

2018-02-26 Thread Michał Górny
---
 bin/eapi.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/eapi.sh b/bin/eapi.sh
index a9c56b8ac..f3ba0da6e 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2012 Gentoo Foundation
+# Copyright 2012-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # PHASES
@@ -193,5 +193,5 @@ ___eapi_bash_3_2() {
 }
 
 ___eapi_bash_4_2() {
-   [[ ${1-${EAPI-0}} =~ ^(6)$ ]]
+   ! ___eapi_bash_3_2
 }
-- 
2.16.2