From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a4a:85c6:0:b0:51a:74fd:9370 with SMTP id u6-20020a4a85c6000000b0051a74fd9370mr254763ooh.9.1675686846938; Mon, 06 Feb 2023 04:34:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aca:5fd7:0:b0:363:e0a0:2a06 with SMTP id t206-20020aca5fd7000000b00363e0a02a06ls3696151oib.8.-pod-prod-gmail; Mon, 06 Feb 2023 04:34:06 -0800 (PST) X-Google-Smtp-Source: AK7set+LX37I1txyn1jU/IlGtuo8N/89+bFaLArN0Ri2dJhkCJfAH1tpLWtboaIzaH6n5ZFCU4O5 X-Received: by 2002:a05:6808:2a02:b0:364:e248:1d70 with SMTP id ez2-20020a0568082a0200b00364e2481d70mr4563462oib.1.1675686846325; Mon, 06 Feb 2023 04:34:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675686846; cv=none; d=google.com; s=arc-20160816; b=kDchnnPYQdcs6kiJUJM8h7lW+ecYmfmdVVppEURIetT1UIZ0ZzQyiTUayl60Z5CxSb wRBHmrkad9jddAQPeR/DNwvXff7dZJg4UKh6wYbarHdVi+ZQlDiK0HTjnP+RXMEncCmw iZJxxifbJph7eVFoNwdpvXxAEGAAedSf/Uyrc4vI8/qpAS/hMnRWmcBvWOaQLuXU8Tjd btlkVXoEn0cH9E5cT1HVx491pSmBhl75r0+Nu85sWkeqk14qAfiQLGi+Cp1jRsaELGkF KcsyMsRUtVXWgmFMap3wZ08Mzlj7Mwhx9GS+ffjKEGXZ8LuRIOmpxC2T8Rc6EmHqssIa LGsQ== 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=Qict3zPZzp5uE2KP3GmZOgaChsoM6SIE8XnvW2AC3Z/OM2JAQe6NZKkWOSMOrR7snb YEevkDjBzf8DpnuhyZx7As+KgxlacdPnNMoDXqrWAXbOA2aik3WakLeO/fqFbZE6fdIv wvqIeLpiyg8VxV6b9xY7IsbRMB2+bnRzU6lpKZjAFh4p/UpQvd0UXwk3B7BoKZ5wpj0n nhw+6ROD9E+I+pW2VjrUUSlg0kkMcj2lpM09lYQMBMEw//4JhewSkHsjxoIUpLGiSTkT H7H9nr+y5xAFerSIzXqJYJEuLHM59kFJ08SB53vS9niDZIKuBAg9WaO79dL+rCHrhKAU KoIw== 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 s22-20020a05680810d600b0036bbb25d978si1082205ois.3.2023.02.06.04.34.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Feb 2023 04:34:06 -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 316CY2Ce005306 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 6 Feb 2023 13:34:04 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 06/15] CI: fix shell coding style Date: Mon, 6 Feb 2023 13:33:53 +0100 Message-Id: <20230206123402.2727-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230206123402.2727-1-ubely@ilbers.de> References: <20230206123402.2727-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: Nq1ewd7aerhR 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