diff options
| -rwxr-xr-x | run | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -2,9 +2,9 @@ # Needed on ubuntu, since this path is not set for root # Arch installs puppet in /usr/bin/puppet. -export PATH="/opt/puppetlabs/bin/puppet:$PATH" +export PATH="/opt/puppetlabs/bin/:$PATH" -osid=$(awk -F= '/^ID/ { print $2 }' /etc/os-release) +osid=$(awk -F= '/^ID=/ { print $2 }' /etc/os-release) # This is the WRONG way to do it, but it sholud work for now case $osid in @@ -16,7 +16,11 @@ case $osid in ;; esac -sudo puppet apply manifests \ - --modulepath="${modpath}:modules" \ +set -x + +sudo env PATH="/opt/puppetlabs/bin/:$PATH" \ + puppet apply \ + --modulepath="$PWD/modules:${modpath}" \ + manifests \ --verbose \ "$@" |