From eb828f793da0b20993f5fa510c05d93b1aeedff7 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov <pavel.zhukov@huawei.com> Date: Tue, 5 Oct 2021 16:57:42 +0200 Subject: [PATCH] weston: weston-start fixes for POSIX shell Fix bashisms to fix weston running under non-bash shells Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com> Closes: https://git.ostc-eu.org/OSTC/OHOS/meta-ohos/-/issues/139 Upstream-status: Submitted Message-Id: <16AB6D14465C2628.4493@lists.openembedded.org> --- .../recipes-graphics/wayland/weston-init/weston-start | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-ohos-core/recipes-graphics/wayland/weston-init/weston-start b/meta-ohos-core/recipes-graphics/wayland/weston-init/weston-start index 117225d8..2776d3ef 100755 --- a/meta-ohos-core/recipes-graphics/wayland/weston-init/weston-start +++ b/meta-ohos-core/recipes-graphics/wayland/weston-init/weston-start @@ -25,10 +25,10 @@ add_openvt_argument() { ## Add module to --modules argument add_weston_module() { - if [[ "x${weston_modules}" == "x" ]]; then + if [ -z "${weston_modules}" ]; then weston_modules="--modules " fi; - weston_modules+="${1}," + weston_modules="${weston_modules}${1}," } @@ -74,7 +74,7 @@ if [ -d "$modules_dir" ]; then # process module . $m done - if [[ x"{$weston_modules}" != "x" ]]; then + if [ -n "${weston_modules}" ]; then add_weston_argument "${weston_modules}" fi; fi -- GitLab