Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle colon-delimited environmentpath in config_version.sh #64

Open
wants to merge 1 commit into
base: production
Choose a base branch
from
Open

Handle colon-delimited environmentpath in config_version.sh #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions scripts/config_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,18 @@
#!/bin/sh

ENVIRONMENTPATH=$1
# $ENVIRONMENTPATH may contain multiple colon-delimited locations.
# We need to pick the first one that contains $ENVIRONMENT.
IFS=":"
for CANDIDATEPATH in ${ENVIRONMENTPATH}; do
if [ -d "${CANDIDATEPATH}/${2}" ]; then
ENVIRONMENTPATH=$CANDIDATEPATH
break
fi
done

# Usage
if [ $# -ne 2 -o ! -d "$1" -o ! -d "$1/$2" ]; then
if [ $# -ne 2 -o ! -d "${ENVIRONMENTPATH}" -o ! -d "${ENVIRONMENTPATH}/$2" ]; then
echo "usage: $0 <environmentpath> <environment>" >&2
exit 1
fi
Expand All @@ -14,19 +25,19 @@ ruby() {
}

# Determine how best to calculate a config_version
if [ -e $1/$2/.r10k-deploy.json ]; then
if [ -e ${ENVIRONMENTPATH}/$2/.r10k-deploy.json ]; then
# The environment was deployed using r10k. We will calculate the config
# version using the r10k data.
ruby $1/$2/scripts/config_version-r10k.rb $1 $2
ruby ${ENVIRONMENTPATH}/$2/scripts/config_version-r10k.rb $1 $2

elif [ -e /opt/puppetlabs/server/pe_version ]; then
# This is a Puppet Enterprise system and we can rely on the rugged ruby gem
# being available.
ruby $1/$2/scripts/config_version-rugged.rb $1 $2
ruby ${ENVIRONMENTPATH}/$2/scripts/config_version-rugged.rb $1 $2

elif type git >/dev/null; then
# The git command is available.
git --git-dir $1/$2/.git rev-parse HEAD
git --git-dir ${ENVIRONMENTPATH}/$2/.git rev-parse HEAD

else
# Nothing else available; just use the date.
Expand Down