From 3ef56680f870c2599ba33589eb8ac084af6e2e86 Mon Sep 17 00:00:00 2001
From: Marek Chrastina <marek.chrastina@vsb.cz>
Date: Tue, 26 Feb 2019 10:28:17 +0100
Subject: [PATCH] Fix shellcheck complaints
---
.gitlab-ci.yml | 1 -
get_modules.sh | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06fa9198..7c75451c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,5 @@ pylint:
shellcheck:
stage: test
image: it4innovations/docker-shellcheck:latest
- allow_failure: true
script:
- shellcheck *.sh
diff --git a/get_modules.sh b/get_modules.sh
index 09b0e39c..afbedf33 100755
--- a/get_modules.sh
+++ b/get_modules.sh
@@ -2,7 +2,7 @@
# vim: ai ts=2 sw=2 et sts=2 ft=sh
PWD="/home/easybuild/git/it4i-modules"
-cd $PWD
+cd $PWD || exit 1
STATE=$(git fetch 2>&1 | grep master)
if [ ! -z "$STATE" ]; then
@@ -11,7 +11,7 @@ if [ ! -z "$STATE" ]; then
exit 0
fi
-CLUSTER=$(echo "$CLUSTERNAME")
+CLUSTER="$CLUSTERNAME"
if [ -z "$CLUSTER" ]; then
echo "CLUSTERNAME not defined"
exit 1
--
GitLab