From 06ce8af68b0a9bd6a68b86f424b6f13596193dd9 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 26 Oct 2021 16:18:30 -0500 Subject: setup: fix shellcheck errors Signed-off-by: Patrick Williams Change-Id: I4c09e61294506659500f9760993dd4b8b6f22f23 --- meta-phosphor/scripts/run-repotest | 1 - setup | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meta-phosphor/scripts/run-repotest b/meta-phosphor/scripts/run-repotest index aa2518b319..dc4e87ca10 100755 --- a/meta-phosphor/scripts/run-repotest +++ b/meta-phosphor/scripts/run-repotest @@ -178,7 +178,6 @@ meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/init_once.sh meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweroff.sh meta-quanta/meta-q71l/recipes-phosphor/quanta-powerctrl/files/poweron.sh meta-yadro/meta-nicole/recipes-phosphor/chassis/avsbus-control/avsbus-control.sh -setup " non_bbfiles=$(git ls-files -- \ diff --git a/setup b/setup index 976e8615fb..3b54c0c827 100755 --- a/setup +++ b/setup @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (c) 2018, YADRO # Author: Alexander Amelkin @@ -49,10 +49,10 @@ machine() { tmpl=${cfg%/machine/*.conf} # Skip any machines that don't support meta-phosphor. - if [ ! -e $tmpl/bblayers.conf.sample ]; then + if [ ! -e "$tmpl/bblayers.conf.sample" ]; then continue fi - if ! grep -q "##OEROOT##/meta-phosphor" $tmpl/bblayers.conf.sample; then + if ! grep -q "##OEROOT##/meta-phosphor" "$tmpl/bblayers.conf.sample"; then continue fi @@ -61,9 +61,9 @@ machine() { if [ -n "$target" ]; then if [ "${name}" = "${target}" ]; then echo "Machine ${target} found in ${tmpl%/conf}" - mkdir -p ${build_dir} + mkdir -p "${build_dir}" TEMPLATECONF="${tmpl}" source \ - oe-init-build-env ${build_dir} + oe-init-build-env "${build_dir}" if [ "$(cat conf/templateconf.cfg)" = "${tmpl}" ]; then sed "s/^\(MACHINE\s*[?:]*\s*=\s*\).*$/\1\"${target}\"/" \ @@ -90,6 +90,6 @@ else if [ -z "$2" ]; then bld_dir="build/$1" fi - machine $1 $bld_dir + machine "$1" "$bld_dir" fi -- cgit v1.2.3