On 16 October 2017 at 20:03, Li Zhijian <lizhij...@cn.fujitsu.com> wrote:
> at commit aea49c3: functions: Fix logic for get_os() function
>  To determine which OS the scripts are running on, check if the
>  build.prop file exists instead of using the lsb_release command.
>  If it does, then the scripts are running on Android; otherwise
>  it's Ubuntu.
>
> From the changelog, we can know get_os() expect to return 2(means android) if
> build.prop file exists, but the code does not do that previouslly
>
> Signed-off-by: Li Zhijian <lizhij...@cn.fujitsu.com>

Patch applied. Thank you!

> ---
>  include/functions.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/functions.sh b/include/functions.sh
> index 10b8de8..0105776 100644
> --- a/include/functions.sh
> +++ b/include/functions.sh
> @@ -425,7 +425,7 @@ sigtrap() {
>  get_os() {
>       build_prop_file="\system\build.prop"
>
> -     if [ -e "$build_prop_file" ]; then
> +     if [ ! -e "$build_prop_file" ]; then
>          # for ubuntu
>          return 1
>       else
> --
> 2.15.0.rc0
>
>
>
> _______________________________________________
> linaro-dev mailing list
> linaro-dev@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-dev
_______________________________________________
linaro-dev mailing list
linaro-dev@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/linaro-dev

Reply via email to