From d7fe4ec39f84ca1c6377971c4590442ba1eb2044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Molinero=20Fern=C3=A1ndez?= Date: Mon, 12 Feb 2018 19:46:37 +0100 Subject: [PATCH] Use $HOSTNAME if is defined --- .gitlab-ci.yml | 2 +- hblock | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 390b106..a27bd63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ build: stage: build script: - apk add --no-cache curl file gawk grep libidn make sed zip - - make build stats index + - HOSTNAME= make build stats index artifacts: expire_in: 1 week paths: diff --git a/hblock b/hblock index 818b2c6..0f5bf63 100755 --- a/hblock +++ b/hblock @@ -16,11 +16,8 @@ backupDir='' lenient=false ignoreDownloadError=false -hostname=$(uname -n) -# Prevent adding 'localhost' twice -hostname=$(printf -- '%s' "$hostname" | sed '/^localhost$/d') -# Prevent adding GitLab CI runner hostname -hostname=$(printf -- '%s' "$hostname" | sed '/^runner-[[:alnum:]]\{8\}-project-.*$/d') +# shellcheck disable=SC2039 +hostname=${HOSTNAME-$(uname -n)} # Default header block header=$(cat <<-EOF