Quote ${EAPI} more.

This will avoid a potential syntax error in save-ebuild-env.sh if a
saved environment containing corrupt EAPI is sourced.

diff --git a/bin/ebuild-helpers/doheader b/bin/ebuild-helpers/doheader
index 9bbe5bc29c2d7701d3ef3373258a28ef8659da8f..c51ec1ed99791df9e806b152725e426cea41de9d 100755 (executable)
--- a/bin/ebuild-helpers/doheader
+++ b/bin/ebuild-helpers/doheader
@@ -4,7 +4,7 @@
 
 source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
 
-case ${EAPI} in
+case "${EAPI}" in
        0|1|2|3|4|4-python|4-slot-abi)
                die "${0##*/} is not supported in EAPI ${EAPI}"
                ;;

diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 2dc041d152fc95691d428f5ae56524dfbead3132..54245f3bc908f0f447b143abe068706252620a9d 100755 (executable)
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -15,7 +15,7 @@ fi
        eqawarn "QA Notice: ${helper} called with more than 2 arguments: ${@:3}"
 
 stdin=
-case ${EAPI} in
+case "${EAPI}" in
        0|1|2|3|4|4-python|4-slot-abi) ;;
        *) [[ $1 = "-" ]] && stdin=yes ;;
 esac

diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index fd7fb25b9569bf873e13f61e580ab93d0c14237c..68a33a87145297b2032e7f3874488b62a6740e8e 100644 (file)
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -755,12 +755,12 @@ _ebuild_phase_funcs() {
                        eval "$x() { _eapi0_$x \"\$@\" ; }"
        done
 
-       case $eapi in
+       case "$eapi" in
 
                0|1)
 
                        if ! declare -F src_compile >/dev/null ; then
-                               case $eapi in
+                               case "$eapi" in
                                        0)
                                                src_compile() { _eapi0_src_compile "$@" ; }
                                                ;;
@@ -807,7 +807,7 @@ _ebuild_phase_funcs() {
 
                                eval "default() { _eapi2_$phase_func \"\$@\" ; }"
 
-                               case $eapi in
+                               case "$eapi" in
                                        2|3)
                                                ;;
                                        *)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 46f713211f0fb6d31f22b03598452ce080dc95f2..0587991f990613414777bc5be90a053b6f8e41e3 100644 (file)
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -174,7 +174,7 @@ usev() {
        return 1
 }
 
-case ${EAPI} in
+case "${EAPI}" in
        0|1|2|3|4|4-python|4-slot-abi) ;;
        *)
                usex() {

diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 75e48437af156ab1f1725272f3ba39272085b247..6d6ed41b69d2b2b5dd9d3e474a7ff49ad4a2a3e7 100644 (file)
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -73,7 +73,7 @@ save_ebuild_env() {
                _hasg _hasgq _unpack_tar \
                ${QA_INTERCEPTORS}
 
-       case ${EAPI} in
+       case "${EAPI}" in
                0|1|2|3|4|4-python|4-slot-abi) ;;
                *) unset -f usex ;;
        esac