openstack/puppet-openstack-integration
Code Issues Proposed changes

Fix scripts to be OSX compatible

Browse Source 
readlink on OSX does not support the -f option. As an alternative, we
can use pwd -P to resolve the path.

Change-Id: Ibaeadea9685f7a9603198ed1a509176cf70f9b21
Closes-Bug: #1506504
This commit is contained in:
Alex Schultz 2015-10-15 09:59:57 -05:00
parent e45bd6059b
commit ba8ee11132
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install_modules.sh
View File

@ -6,7 +6,7 @@ if [ ! -z ${GEM_HOME} ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
export SCRIPT_DIR=$(readlink -f "$(dirname $0)")
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-/etc/puppet/modules}
source $SCRIPT_DIR/functions

2
install_modules_unit.sh
View File

@ -10,7 +10,7 @@ if [ ! -z ${GEM_HOME} ]; then
GEM_BIN_DIR=${GEM_HOME}/bin/
fi
export SCRIPT_DIR=$(readlink -f "$(dirname $0)")
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
export PUPPETFILE_DIR=${PUPPETFILE_DIR:-/etc/puppet/modules}
source $SCRIPT_DIR/functions