diff --git a/install_modules.sh b/install_modules.sh index 9c785cfc4..730da25e4 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -6,6 +6,12 @@ if [ ! -z ${GEM_HOME} ]; then GEM_BIN_DIR=${GEM_HOME}/bin/ fi +if [ $PUPPET_VERSION == 4 ]; then + export PUPPET_BASE_PATH=/etc/puppetlabs/code +else + export PUPPET_BASE_PATH=/etc/puppet +fi + export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules} source $SCRIPT_DIR/functions diff --git a/install_modules_unit.sh b/install_modules_unit.sh index 77ac1d22d..5d881d858 100755 --- a/install_modules_unit.sh +++ b/install_modules_unit.sh @@ -10,6 +10,12 @@ if [ ! -z ${GEM_HOME} ]; then GEM_BIN_DIR=${GEM_HOME}/bin/ fi +if [ $PUPPET_VERSION == 4 ]; then + export PUPPET_BASE_PATH=/etc/puppetlabs/code +else + export PUPPET_BASE_PATH=/etc/puppet +fi + export SCRIPT_DIR=$(cd `dirname $0` && pwd -P) export PUPPETFILE_DIR=${PUPPETFILE_DIR:-${PUPPET_BASE_PATH}/modules} source $SCRIPT_DIR/functions