From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a67:fbcd:0:b0:3ef:b1ba:4e8 with SMTP id o13-20020a67fbcd000000b003efb1ba04e8mr1313576vsr.35.1675399472120; Thu, 02 Feb 2023 20:44:32 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:cd15:0:b0:3b1:1703:92cb with SMTP id u21-20020a67cd15000000b003b1170392cbls1294991vsl.1.-pod-prod-gmail; Thu, 02 Feb 2023 20:44:31 -0800 (PST) X-Google-Smtp-Source: AK7set/XhIHe1+1QCSzzPUGowV6UhqII1/bdf0001x7DzIQ1yrJfAcq61TL8S4cHdhbHWEsmP6M/ X-Received: by 2002:a05:6102:45:b0:3eb:9c5c:eddc with SMTP id k5-20020a056102004500b003eb9c5ceddcmr5561397vsp.9.1675399471237; Thu, 02 Feb 2023 20:44:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675399471; cv=none; d=google.com; s=arc-20160816; b=jfFrHWZgw+3RGHLvydY01LKSMKgdV9Vm49hGQj8+gndeTlTJ9QkjWE4ueT2BlZ4sgW R9QK3KvGQb7CtZIHSLwKQo30WG2H5VSiDePz4b70MUqWswFMTvdnbibvQcAGG+DdvEiY AXRGDdcKJV0Hca5ecAYL6PUcxiyjbFUx21EA90zvYbD71NLZ/tLS6wIVoeEnX5zrqeee kIFitu4SFwRlAXilGgD0/hc96xEmNVa2Bcwi5WhmgX3MTHYKMNdNcbohmT3u3ZeEI/Pg mn24tR7BGyPnjH/01yZZWvRvIPQhqgcAj4KGqU1S+u1sqZ+6xU7B9raXcyyuiRmkhdaD d6lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=+FA8paT+fMjwo4lSiXt57K6QyP0B7ZC8hvi1kqT3K54=; b=A/w8pK/BgA1lX7PemtWlsFFvAtGTHze1CeINpWW0bnKLXEFPjGRuR+U2wxLt7M0IJd QdFZ9EerWbaj36ccuQY4jjX7lJlWeiVJTJJXc6yrJGyVNPp0IdDLQHahMS4Jfe+yA0od rI+MkHguo4ntJsf24OGIKcF0rAao+BCDdZ3czc6cxRlGoU99+nOCVuscTxZfucH/Dwf8 3QdKMDUWXfhtXz9y6jtakXF5rgLx6iVsQUssgr6UrnyAeiiQ3qVXyxw4vxzQJ3zmReip Oi4t6nN3AhG8KOCeGZtJ8SEtgpve9yMFj6EznYgVk1kId7NhSvjlCnplfW1KwhOOCTRr NY5Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g1-20020ab072c1000000b0063914c44d3csi81121uap.1.2023.02.02.20.44.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Feb 2023 20:44:31 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 3134iRm0023918 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 3 Feb 2023 05:44:29 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 06/15] CI: fix shell coding style Date: Fri, 3 Feb 2023 05:44:17 +0100 Message-Id: <20230203044427.32711-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230203044427.32711-1-ubely@ilbers.de> References: <20230203044427.32711-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: MIx89xAeEyLp From: Henning Schild Apply some suggestions from shellcheck and make sure that runs fine. Signed-off-by: Henning Schild --- scripts/ci_build.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 84a3e472..e5f20d4f 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -20,6 +20,7 @@ if ! command -v avocado > /dev/null; then sudo apt-get install -y virtualenv rm -rf /tmp/avocado_venv virtualenv --python python3 /tmp/avocado_venv + # shellcheck source=/dev/null source /tmp/avocado_venv/bin/activate pip install avocado-framework==99.0 fi @@ -33,8 +34,8 @@ BASE_DIR=./build # Check dependencies DEPENDENCIES="umoci skopeo" for prog in ${DEPENDENCIES} ; do - if [ ! -x "$(which $prog)" ] ; then - echo "missing $prog in PATH" >&2 + if ! command -v "${prog}" > /dev/null; then + echo "missing ${prog} in PATH" >&2 fi done @@ -132,16 +133,16 @@ fi mkdir -p .config/avocado cat < .config/avocado/avocado.conf [datadir.paths] -base_dir = $(realpath $BASE_DIR)/ -test_dir = $(realpath $BASE_DIR)/tests -data_dir = $(realpath $BASE_DIR)/data -logs_dir = $(realpath $BASE_DIR)/job-results +base_dir = $(realpath "${BASE_DIR}")/ +test_dir = $(realpath "${BASE_DIR}")/tests +data_dir = $(realpath "${BASE_DIR}")/data +logs_dir = $(realpath "${BASE_DIR}")/job-results EOF export VIRTUAL_ENV="./" # the real stuff starts here, trace commands from now on set -x -avocado $VERBOSE run "$TESTSUITE_DIR/citest.py" \ - -t $TAGS --nrunner-max-parallel-tasks=1 --disable-sysinfo \ - -p quiet=$QUIET -p cross=$CROSS_BUILD -p time_to_wait=$TIMEOUT +avocado ${VERBOSE} run "${TESTSUITE_DIR}/citest.py" \ + -t "${TAGS}" --nrunner-max-parallel-tasks=1 --disable-sysinfo \ + -p quiet="${QUIET}" -p cross="${CROSS_BUILD}" -p time_to_wait="${TIMEOUT}" -- 2.20.1