From df38b9919010096e71421485c17f5addd3e2baaf Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Fri, 6 Sep 2019 10:53:58 +0200 Subject: scripts: use short options instead of long ones In order to be compatible with more `grep` versions (notably busybox ones which don't have long option names in our new CI environments) we need to use short cli options. --- files/clever-set-domain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/files/clever-set-domain.sh b/files/clever-set-domain.sh index a6454df..a562703 100755 --- a/files/clever-set-domain.sh +++ b/files/clever-set-domain.sh @@ -3,7 +3,8 @@ set -e function checkDomain { - clever domain | grep --ignore-case "${DOMAIN}" + # DNS domain names are case insensitive + clever domain | grep -i "${DOMAIN}" } function setDomain { -- cgit v1.2.3 From f24fb372bd6448f4e9e918a5ccace0d40f1770b8 Mon Sep 17 00:00:00 2001 From: Paul Bonaud Date: Fri, 6 Sep 2019 11:09:52 +0200 Subject: ci: fix nix packages due to Travis nix update to 19.09 packages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 36019b8..3004369 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: nix sudo: false install: - - nix-env -i python2.7-ansible python2.7-ansible-lint ShellCheck-0.6.0 + - nix-env -i python2.7-ansible python2.7-ansible-lint ShellCheck-0.7.0 - nix-env -if ./dhall-1.21.0.nix # Check ansible version -- cgit v1.2.3