diff options
| author | mail_redacted_for_web | 2017-07-05 17:17:57 -0700 |
|---|---|---|
| committer | mail_redacted_for_web | 2017-07-05 17:17:57 -0700 |
| commit | ee0e87de27b107db4c2fbf0dfc7f3c2bd8cbfab4 (patch) | |
| tree | 6ce7bd7707c0abc0bbab731b4b1b908975cd4e3b /scripts/config_version.sh | |
| parent | ac9785273a1060a5b6c18129985f8cdb01c77d54 (diff) | |
| parent | 124b1a2727466e63cf82858bb09749454dae40d3 (diff) | |
| download | control-repo-template-ee0e87de27b107db4c2fbf0dfc7f3c2bd8cbfab4.tar.bz2 | |
Merge pull request #50 from natemccurdy/show_master
config_version: Show the compiling master's name
Diffstat (limited to 'scripts/config_version.sh')
| -rwxr-xr-x | scripts/config_version.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/config_version.sh b/scripts/config_version.sh index bc77213..8dd8086 100755 --- a/scripts/config_version.sh +++ b/scripts/config_version.sh @@ -3,10 +3,10 @@ if [ -e $1/$2/.r10k-deploy.json ] then /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2 elif [ -e /opt/puppetlabs/server/pe_version ] -then - /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 +then + /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 else /usr/bin/git --version > /dev/null 2>&1 && /usr/bin/git --git-dir $1/$2/.git rev-parse HEAD || date +%s -fi +fi |