File tree 1 file changed +15
-4
lines changed
1 file changed +15
-4
lines changed Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
- if [ -e $1 /$2 /.r10k-deploy.json ]
2
+ ENVIRONMENTPATH=$1
3
+ # $ENVIRONMENTPATH may contain multiple colon-delimited locations.
4
+ # We need to pick the first one that contains $ENVIRONMENT.
5
+ IFS=" :"
6
+ for CANDIDATEPATH in ${ENVIRONMENTPATH} ; do
7
+ if [ -d " ${CANDIDATEPATH} /${2} " ]; then
8
+ ENVIRONMENTPATH=$CANDIDATEPATH
9
+ break
10
+ fi
11
+ done
12
+
13
+ if [ -e " ${ENVIRONMENTPATH} /$2 /.r10k-deploy.json" ]
3
14
then
4
- /opt/puppetlabs/puppet/bin/ruby $1 /$2 /scripts/code_manager_config_version.rb $1 $2
15
+ /opt/puppetlabs/puppet/bin/ruby " ${ENVIRONMENTPATH} /$2 /scripts/code_manager_config_version.rb" ${ENVIRONMENTPATH} $2
5
16
elif [ -e /opt/puppetlabs/server/pe_version ]
6
17
then
7
- /opt/puppetlabs/puppet/bin/ruby $1 /$2 /scripts/config_version.rb $1 $2
18
+ /opt/puppetlabs/puppet/bin/ruby " ${ENVIRONMENTPATH} /$2 /scripts/config_version.rb" ${ENVIRONMENTPATH} $2
8
19
else
9
20
/usr/bin/git --version > /dev/null 2>&1 &&
10
- /usr/bin/git --git-dir $1 /$2 /.git rev-parse HEAD ||
21
+ /usr/bin/git --git-dir " ${ENVIRONMENTPATH} /$2 /.git" rev-parse HEAD ||
11
22
date +%s
12
23
fi
You can’t perform that action at this time.
0 commit comments