From 415a71dd59c17093684efd3a1376afe1bfb8824d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Sat, 7 Apr 2018 11:59:18 +0200
Subject: [PATCH] Remove code dead for more than 2 years

r10k generates a .r10k-deploy.json file since version 2.1.0 which was
released on October 28, 2015.  New users of the control-repo are not
likely to have a so old version of r10k, so remove this dead code.
---
 scripts/config_version.rb | 24 ------------------------
 scripts/config_version.sh |  7 +------
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 scripts/config_version.rb

diff --git a/scripts/config_version.rb b/scripts/config_version.rb
deleted file mode 100644
index 5652226..0000000
--- a/scripts/config_version.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-begin
-  require 'rugged'
-  require 'socket'
-rescue LoadError
-  t = Time.new
-  puts t.to_i
-else
-  environmentpath = ARGV[0]
-  environment     = ARGV[1]
-
-  # Get the hostname of the Puppet master compiling the catalog.
-  # Sometimes the hostname is the fqdn, so we'll take the first segment.
-  compiling_master = Socket.gethostname.split('.').first
-
-  # Get the path to the environment being compiled.
-  repo = Rugged::Repository.discover(File.join(environmentpath, environment))
-  head = repo.head
-
-  # First 12 characters of the sha1 hash of the newest commit.
-  commit_id = head.target_id[0...11]
-
-  # Show the compiling master, environment name, and commit ID.
-  puts "#{compiling_master}-#{environment}-#{commit_id}"
-end
diff --git a/scripts/config_version.sh b/scripts/config_version.sh
index 7ccd2f4..1dc54f7 100755
--- a/scripts/config_version.sh
+++ b/scripts/config_version.sh
@@ -6,14 +6,9 @@ if [ $# -ne 2 -o ! -d "$1" -o ! -d "$1/$2" ]; then
 fi
 
 ruby=ruby
-script="$1/$2/scripts/config_version.rb"
 
 if [ -x /opt/puppetlabs/puppet/bin/ruby ]; then
   ruby=/opt/puppetlabs/puppet/bin/ruby
 fi
 
-if [ -e $1/$2/.r10k-deploy.json ]; then
-  script="$1/$2/scripts/code_manager_config_version.rb"
-fi
-
-"${ruby}" "${script}" "$1" "$2"
+"${ruby}" "$1/$2/scripts/code_manager_config_version.rb" "$1" "$2"