[oe-layersetup] oe-layer-setup.sh: Stop claiming generic sh support

Message ID 20220426142651.22361-1-nm@ti.com
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series [oe-layersetup] oe-layer-setup.sh: Stop claiming generic sh support | expand

Commit Message

Nishanth Menon April 26, 2022, 2:26 p.m. UTC
Lets be clear that we work with bash and not variants such as dash.

Signed-off-by: Nishanth Menon <nm@ti.com>
---

There has been a bit of bashism that has crept into various checks,
which is fine as long as folks use bash ;) OR we can start cleaning up
in a manner to support dash and variants of that form.

 oe-layertool-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Davis April 26, 2022, 2:35 p.m. UTC | #1
On 4/26/22 9:26 AM, Nishanth Menon via lists.yoctoproject.org wrote:
> Lets be clear that we work with bash and not variants such as dash.
> 
> Signed-off-by: Nishanth Menon <nm@ti.com>
> ---
> 
> There has been a bit of bashism that has crept into various checks,
> which is fine as long as folks use bash ;) OR we can start cleaning up
> in a manner to support dash and variants of that form.
> 


I'd rather just fix the bashisms, this fixes us at least enough
to get dash back working:


 From 4e46cf04046aee084b4e83cef28d4500d1d3dc56 Mon Sep 17 00:00:00 2001
From: Andrew Davis <afd@ti.com>
Date: Mon, 25 Apr 2022 16:31:35 -0500
Subject: [PATCH] Fix non-standard shell usage

Signed-off-by: Andrew Davis <afd@ti.com>
---
  oe-layertool-setup.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
index f171f94..e05737b 100755
--- a/oe-layertool-setup.sh
+++ b/oe-layertool-setup.sh
@@ -780,7 +780,7 @@ print_image_names() {
      for FOLDER in ${FOLDERS}
      do
          RECO=""
-        if [ "${FOLDER}" == "meta-arago" ]; then
+        if [ "${FOLDER}" = "meta-arago" ]; then
              RECO="[recommended]"
          fi
          echo "From ${FOLDER}${RECO}:"
@@ -796,7 +796,7 @@ print_image_names() {
                      if [ -z "${summary}" ]; then
                          summary="No Summary available"
                      fi
-                    echo -e "\t${name}: ${summary}"
+                    echo "    ${name}: ${summary}"
                  done
              fi
          done
Nishanth Menon April 26, 2022, 6:25 p.m. UTC | #2
On 09:35-20220426, Andrew Davis wrote:
> On 4/26/22 9:26 AM, Nishanth Menon via lists.yoctoproject.org wrote:
> > Lets be clear that we work with bash and not variants such as dash.
> > 
> > Signed-off-by: Nishanth Menon <nm@ti.com>
> > ---
> > 
> > There has been a bit of bashism that has crept into various checks,
> > which is fine as long as folks use bash ;) OR we can start cleaning up
> > in a manner to support dash and variants of that form.
> > 
> 
> 
> I'd rather just fix the bashisms, this fixes us at least enough
> to get dash back working:

> 
> 
> From 4e46cf04046aee084b4e83cef28d4500d1d3dc56 Mon Sep 17 00:00:00 2001
> From: Andrew Davis <afd@ti.com>
> Date: Mon, 25 Apr 2022 16:31:35 -0500
> Subject: [PATCH] Fix non-standard shell usage
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  oe-layertool-setup.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
> index f171f94..e05737b 100755
> --- a/oe-layertool-setup.sh
> +++ b/oe-layertool-setup.sh
> @@ -780,7 +780,7 @@ print_image_names() {
>      for FOLDER in ${FOLDERS}
>      do
>          RECO=""
> -        if [ "${FOLDER}" == "meta-arago" ]; then
> +        if [ "${FOLDER}" = "meta-arago" ]; then
>              RECO="[recommended]"
>          fi
>          echo "From ${FOLDER}${RECO}:"
> @@ -796,7 +796,7 @@ print_image_names() {
>                      if [ -z "${summary}" ]; then
>                          summary="No Summary available"
>                      fi
> -                    echo -e "\t${name}: ${summary}"
> +                    echo "    ${name}: ${summary}"


Yep, fair enough - I am still not a dash fan. could you post this as an
formal patch?

>                  done
>              fi
>          done
> -- 
> 2.17.1
> 
> 
> >   oe-layertool-setup.sh | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
> > index f171f94cf0fc..6654869ac061 100755
> > --- a/oe-layertool-setup.sh
> > +++ b/oe-layertool-setup.sh
> > @@ -1,4 +1,4 @@
> > -#!/bin/sh
> > +#!/bin/bash
> >   # OE Build Enviroment Setup Script
> >   #
Andrew Davis April 26, 2022, 8:08 p.m. UTC | #3
On 4/26/22 1:25 PM, Nishanth Menon wrote:
> On 09:35-20220426, Andrew Davis wrote:
>> On 4/26/22 9:26 AM, Nishanth Menon via lists.yoctoproject.org wrote:
>>> Lets be clear that we work with bash and not variants such as dash.
>>>
>>> Signed-off-by: Nishanth Menon <nm@ti.com>
>>> ---
>>>
>>> There has been a bit of bashism that has crept into various checks,
>>> which is fine as long as folks use bash ;) OR we can start cleaning up
>>> in a manner to support dash and variants of that form.
>>>
>>
>>
>> I'd rather just fix the bashisms, this fixes us at least enough
>> to get dash back working:
> 
>>
>>
>>  From 4e46cf04046aee084b4e83cef28d4500d1d3dc56 Mon Sep 17 00:00:00 2001
>> From: Andrew Davis <afd@ti.com>
>> Date: Mon, 25 Apr 2022 16:31:35 -0500
>> Subject: [PATCH] Fix non-standard shell usage
>>
>> Signed-off-by: Andrew Davis <afd@ti.com>
>> ---
>>   oe-layertool-setup.sh | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>> index f171f94..e05737b 100755
>> --- a/oe-layertool-setup.sh
>> +++ b/oe-layertool-setup.sh
>> @@ -780,7 +780,7 @@ print_image_names() {
>>       for FOLDER in ${FOLDERS}
>>       do
>>           RECO=""
>> -        if [ "${FOLDER}" == "meta-arago" ]; then
>> +        if [ "${FOLDER}" = "meta-arago" ]; then
>>               RECO="[recommended]"
>>           fi
>>           echo "From ${FOLDER}${RECO}:"
>> @@ -796,7 +796,7 @@ print_image_names() {
>>                       if [ -z "${summary}" ]; then
>>                           summary="No Summary available"
>>                       fi
>> -                    echo -e "\t${name}: ${summary}"
>> +                    echo "    ${name}: ${summary}"
> 
> 
> Yep, fair enough - I am still not a dash fan. could you post this as an
> formal patch?
> 


Sure, sent.

Andrew


>>                   done
>>               fi
>>           done
>> -- 
>> 2.17.1
>>
>>
>>>    oe-layertool-setup.sh | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
>>> index f171f94cf0fc..6654869ac061 100755
>>> --- a/oe-layertool-setup.sh
>>> +++ b/oe-layertool-setup.sh
>>> @@ -1,4 +1,4 @@
>>> -#!/bin/sh
>>> +#!/bin/bash
>>>    # OE Build Enviroment Setup Script
>>>    #
>

Patch

diff --git a/oe-layertool-setup.sh b/oe-layertool-setup.sh
index f171f94cf0fc..6654869ac061 100755
--- a/oe-layertool-setup.sh
+++ b/oe-layertool-setup.sh
@@ -1,4 +1,4 @@ 
-#!/bin/sh
+#!/bin/bash
 
 # OE Build Enviroment Setup Script
 #