From f5cb1fa75796327cefe8054efeab855c143ef2e3 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 3 Aug 2015 17:05:06 -0700 Subject: Update config_version to use a script that does not require git The config_version now uses a script that will do one of two things: 1. call config_version.rb which uses rugged to find the information about the latest commit if PE is on version 2015.2 or newer 2. make a call to git if the PE version is less than 2015.2 --- scripts/config_version.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 scripts/config_version.sh (limited to 'scripts/config_version.sh') diff --git a/scripts/config_version.sh b/scripts/config_version.sh new file mode 100644 index 0000000..1f42d34 --- /dev/null +++ b/scripts/config_version.sh @@ -0,0 +1,7 @@ +#!/bin/bash +if [ -e /opt/puppetlabs/server/pe_version ] +then + /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 +else + /usr/bin/git --git-dir $codedir/environments/$environment/.git rev-parse HEAD +fi -- cgit v1.2.3 From 5d0ae0c01fc5f3dbc1da07fe0a58ea1b36f2ead6 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 3 Aug 2015 17:45:12 -0700 Subject: fix config_version script for 3.8 and below --- scripts/config_version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/config_version.sh') diff --git a/scripts/config_version.sh b/scripts/config_version.sh index 1f42d34..543ec26 100644 --- a/scripts/config_version.sh +++ b/scripts/config_version.sh @@ -3,5 +3,5 @@ if [ -e /opt/puppetlabs/server/pe_version ] then /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2 else - /usr/bin/git --git-dir $codedir/environments/$environment/.git rev-parse HEAD + /usr/bin/git --git-dir $1/$2/.git rev-parse HEAD fi -- cgit v1.2.3 From b0c5ac495c40e6208460afaedd2ae5b8b1cb954f Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Thu, 13 Aug 2015 14:47:08 -0700 Subject: Add execute bit to config_version scripts --- scripts/config_version.rb | 0 scripts/config_version.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 scripts/config_version.rb mode change 100644 => 100755 scripts/config_version.sh (limited to 'scripts/config_version.sh') diff --git a/scripts/config_version.rb b/scripts/config_version.rb old mode 100644 new mode 100755 diff --git a/scripts/config_version.sh b/scripts/config_version.sh old mode 100644 new mode 100755 -- cgit v1.2.3