Skip to content

Commit 415a71d

Browse files
committed
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.
1 parent 211ecc5 commit 415a71d

File tree

2 files changed

+1
-30
lines changed

2 files changed

+1
-30
lines changed

scripts/config_version.rb

Lines changed: 0 additions & 24 deletions
This file was deleted.

scripts/config_version.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,9 @@ if [ $# -ne 2 -o ! -d "$1" -o ! -d "$1/$2" ]; then
66
fi
77

88
ruby=ruby
9-
script="$1/$2/scripts/config_version.rb"
109

1110
if [ -x /opt/puppetlabs/puppet/bin/ruby ]; then
1211
ruby=/opt/puppetlabs/puppet/bin/ruby
1312
fi
1413

15-
if [ -e $1/$2/.r10k-deploy.json ]; then
16-
script="$1/$2/scripts/code_manager_config_version.rb"
17-
fi
18-
19-
"${ruby}" "${script}" "$1" "$2"
14+
"${ruby}" "$1/$2/scripts/code_manager_config_version.rb" "$1" "$2"

0 commit comments

Comments
 (0)