From 46e0d7a0709fb5f2279b5ad97891694d1280945d Mon Sep 17 00:00:00 2001 From: downtownallday Date: Tue, 9 Jun 2020 21:33:30 -0400 Subject: [PATCH] Don't overwrite PRIMARY_HOSTNAME if already set --- tests/assets/system-setup/setup-defaults.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/assets/system-setup/setup-defaults.sh b/tests/assets/system-setup/setup-defaults.sh index 851f92d6..739a0260 100755 --- a/tests/assets/system-setup/setup-defaults.sh +++ b/tests/assets/system-setup/setup-defaults.sh @@ -12,7 +12,7 @@ export PUBLIC_IP="${PUBLIC_IP:-$(source setup/functions.sh; get_default_privatei if [ "$TRAVIS" == "true" ]; then export PRIMARY_HOSTNAME=${PRIMARY_HOSTNAME:-box.abc.com} elif [ -z "$PRIMARY_HOSTNAME" ]; then - export PRIMARY_HOSTNAME=$(hostname --fqdn || hostname) + export PRIMARY_HOSTNAME=${PRIMARY_HOSTNAME:-$(hostname --fqdn || hostname)} fi