Skip to contentSkip to conversation

oe-layer-setup.sh: Stop claiming generic sh support

PATCH In review Nishanth Menon 2 participants 4 messages Apr 26, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oe-layer-setup.sh: Stop claiming generic sh support

Lets be clear that we work with bash and not variants such as dash.

---

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(-)
oe-layertool-setup.sh +1 -1
index f171f94cf0fc..6654869ac061 100755
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # OE Build Enviroment Setup Script
 #
Signature · 1 line
2.31.1
#1 lore raw
Quoted 9 lines · Nishanth Menon via lists.yoctoproject.org

Lets be clear that we work with bash and not variants such as dash.

---

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 <[email protected]>
Date: Mon, 25 Apr 2022 16:31:35 -0500
Subject: [PATCH] Fix non-standard shell usage

---
 oe-layertool-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
oe-layertool-setup.sh +2 -2
index f171f94..e05737b 100755
@@ -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
Signature · 1 line
2.17.1
Quoted 13 lines
  oe-layertool-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
oe-layertool-setup.sh +1 -1
index f171f94cf0fc..6654869ac061 100755
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
  # OE Build Enviroment Setup Script
  #
#2 lore raw
Quoted 41 lines · Andrew Davis
Quoted 9 lines · Nishanth Menon via lists.yoctoproject.org

Lets be clear that we work with bash and not variants such as dash.

---

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 <[email protected]>
Date: Mon, 25 Apr 2022 16:31:35 -0500
Subject: [PATCH] Fix non-standard shell usage

---
 oe-layertool-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
oe-layertool-setup.sh +1 -1
index f171f94..e05737b 100755
@@ -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}:"

oe-layertool-setup.sh print_image_names() { · line 799

Quoted 5 lines
oe-layertool-setup.sh +1 -1
@@ -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?

Quoted 19 lines
oe-layertool-setup.sh +0 -0
                 done
             fi
         done
Signature · 1 line
2.17.1
Quoted 12 lines
  oe-layertool-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
oe-layertool-setup.sh +1 -1
index f171f94cf0fc..6654869ac061 100755
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
  # OE Build Enviroment Setup Script
  #
Signature · 3 lines
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D
#3 lore raw
Quoted 43 lines · Nishanth Menon
Quoted 42 lines · Andrew Davis
Quoted 9 lines · Nishanth Menon via lists.yoctoproject.org

Lets be clear that we work with bash and not variants such as dash.

---

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 <[email protected]>
Date: Mon, 25 Apr 2022 16:31:35 -0500
Subject: [PATCH] Fix non-standard shell usage

---
  oe-layertool-setup.sh | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
oe-layertool-setup.sh +1 -1
index f171f94..e05737b 100755
@@ -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
Quoted 9 lines

oe-layertool-setup.sh print_image_names() { · line 799

Quoted 4 lines
oe-layertool-setup.sh +1 -1
                          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

Quoted 20 lines
Quoted 19 lines
oe-layertool-setup.sh +0 -0
                  done
              fi
          done
Signature · 1 line
2.17.1
Quoted 12 lines
   oe-layertool-setup.sh | 2 +-
   1 file changed, 1 insertion(+), 1 deletion(-)
oe-layertool-setup.sh +1 -1
index f171f94cf0fc..6654869ac061 100755
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
   # OE Build Enviroment Setup Script
   #