scripts: apply fixes to helpers when using set -eE (#3285)

For an upcoming PR, these changes are required, because the script that
is using the helpers uses `set -eE`. This leads to situations where
errors are not properly handled in our helpers (yet; I plan on changing
that in the future).
This commit is contained in:
Georg Lauterbach 2023-04-24 14:35:19 +02:00 committed by GitHub
parent 449d53fc3f
commit 7e7497ae5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 4 deletions

View file

@ -41,7 +41,7 @@ function _obtain_hostname_and_domainname
# of this variable or if a more deterministic approach with `cut` should be relied on.
if [[ $(_get_label_count "${HOSTNAME}") -gt 2 ]]
then
if [[ -n ${OVERRIDE_HOSTNAME} ]]
if [[ -n ${OVERRIDE_HOSTNAME:-} ]]
then
# Emulates the intended behaviour of `hostname -d`:
# Assign the HOSTNAME value minus everything up to and including the first `.`