From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7192322883099557888 X-Received: by 2002:a05:6870:a706:b0:15f:87c4:7838 with SMTP id g6-20020a056870a70600b0015f87c47838mr1748529oam.51.1674593178335; Tue, 24 Jan 2023 12:46:18 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:13d3:b0:66c:e766:8d07 with SMTP id e19-20020a05683013d300b0066ce7668d07ls3214651otq.10.-pod-prod-gmail; Tue, 24 Jan 2023 12:46:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXuQ3Td7s0P6rRc4+2cDYsshQ39TATy+tNozHWrMynk1zB7Yg+ZxURNaHobu7FCrXEpYvIC+ X-Received: by 2002:a05:6830:b8e:b0:684:b059:4569 with SMTP id a14-20020a0568300b8e00b00684b0594569mr26047273otv.5.1674593177847; Tue, 24 Jan 2023 12:46:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674593177; cv=none; d=google.com; s=arc-20160816; b=SIM1eYdkDF3cXjhOSSMV/iU1FmT2+tsssFzLiRMeLi0QURd+uOl4QRoA7c+y1G0zSy EAsx+A2Pr4DNYzflKk6+nm4UNyQCGp260nCSlfSqvAgpsUogBCK9bFfam8t/aJX+V7lW nLt6RpNUhd5tz9I5mED2mp27NFAsE9PA1IVcL0exlTqkkr16H7b54dt6DrNUGL7EjTxG aCu40g2LvWoLIyiIGU3NR+JwLg/a75B7AEFYGOiTagMYaKEKPhvVmXTlYHweIh6E46Ch r/g1DZ0fc4LgdwiF2CNy640RtpeXrE43Vnv39H6FDyr+GFrJlmTrA9lOhizTOa0McrAy 0PCA== 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:cc:to:from; bh=oOOA0UrHBuOdcvnlms0kWv6WsVwg2g2R0aa27enAi2o=; b=DeDy5MYxVDUuxLfCsbxEOYBtWHU98py0Q1/d8PmcFyIMH/ZUMu3EQPSLvVY3pPSfXd jTgqyreZx8Fp67DqXuXx89lSy8CZt7k35pjAAjPCu4q54OSEwMkJViuK23prAnDjr+XS wgQBNUTwbv8+N0BnfWF+9Da/FqafUeNeFUwXzfmXZ3XQSQJK4Ghsro/PfROohskFcAv1 mjcl8S1g4V/CKhX2O2BrwdPljr6V34M0yt7dT2oiGIWGW3QPE5UDAQ64GxRpg4KbBMHM KDZcXQKMY4wImOEamFLI7B+2JzlyyjXDmsYByIbGSaJh3xkBVmTfLGIC2C8EVvfDRei2 dhOw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id bu7-20020a0568300d0700b0066fe878940fsi536941otb.5.2023.01.24.12.46.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 12:46:17 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.. (IN-213-226-141-182.bitemobile.lv [213.226.141.182] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 30OKk19a023256 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 24 Jan 2023 21:46:15 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v2 06/15] CI: fix shell coding style Date: Tue, 24 Jan 2023 22:45:49 +0200 Message-Id: <20230124204558.31025-7-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124204558.31025-1-amikan@ilbers.de> References: <20230124204558.31025-1-amikan@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: Kf9Oq8LeD47N 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 84a3e47..e5f20d4 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.34.1