Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a3d37e2 authored by Guillaume Chelfi's avatar Guillaume Chelfi Committed by android-build-merger
Browse files

Merge "Fix zsh compatibility issue in build/envsetup.sh" am: 3da31913 am:... 

Merge "Fix zsh compatibility issue in build/envsetup.sh" am: 3da31913 am: 49e31727 am: 24a09dc0
am: 29f20643

Change-Id: Iabb0e24502da8d72ead408014cda60642dd6d639
parents dfb5b549 29f20643

envsetup.sh

+3 −3
Original line number Original line Diff line number Diff line
@@ -524,7 +524,7 @@ function choosevariant() 
            export TARGET_BUILD_VARIANT=$default_value

            export TARGET_BUILD_VARIANT=$default_value

        elif (echo -n $ANSWER | grep -q -e "^[0-9][0-9]*$") ; then

        elif (echo -n $ANSWER | grep -q -e "^[0-9][0-9]*$") ; then

            if [ "$ANSWER" -le "${#VARIANT_CHOICES[@]}" ] ; then

            if [ "$ANSWER" -le "${#VARIANT_CHOICES[@]}" ] ; then

                export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[$(($ANSWER-1))]}

                export TARGET_BUILD_VARIANT=${VARIANT_CHOICES[@]:$(($ANSWER-1)):1}

            fi

            fi

        else

        else

            if check_variant $ANSWER

            if check_variant $ANSWER
@@ -1295,10 +1295,10 @@ function godir () { 
                echo "Invalid choice"

                echo "Invalid choice"

                continue

                continue

            fi

            fi

            pathname=${lines[$(($choice-1))]}

            pathname=${lines[@]:$(($choice-1)):1}

        done

        done

    else

    else

        pathname=${lines[0]}

        pathname=${lines[@]:0:1}

    fi

    fi

    \cd $T/$pathname

    \cd $T/$pathname

}

}