From 8db8f9b167b53e3a3421fcad783b6c2dcdfb1a3d Mon Sep 17 00:00:00 2001 From: Elijah Lazkani Date: Sat, 4 Mar 2017 11:45:16 -0500 Subject: [PATCH] Escaping the Travis environment for unknown packages --- .travis/grains.sh | 2 +- salty/base/zsh/init.sls | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis/grains.sh b/.travis/grains.sh index db34795..dcde6f3 100644 --- a/.travis/grains.sh +++ b/.travis/grains.sh @@ -1,3 +1,3 @@ #!/bin/bash -salt-call --local --config=./ --state-output=changes grains.setvals "{ \"user\": \"$(whoami)\", \"group\": \"$(id -g -n $(whoami))\", \"homedir\": \"$HOME\" }" +salt-call --local --config=./ --state-output=changes grains.setvals "{ \"user\": \"$(whoami)\", \"group\": \"$(id -g -n $(whoami))\", \"homedir\": \"$HOME\", \"travis\": True }" diff --git a/salty/base/zsh/init.sls b/salty/base/zsh/init.sls index c1394d8..f46f2b0 100644 --- a/salty/base/zsh/init.sls +++ b/salty/base/zsh/init.sls @@ -2,9 +2,11 @@ zsh: pkg.installed: - name: zsh +{% if grains['travis'] != True %} zsh-syntax-highlighting: pkg.installed: - name: zsh-syntax-highlighting +{% endif %} {% if grains['kernel'] == 'Darwin' %} zsh-completions: