Merge pull request #79 from dmartingit/remove-special-behavior-for-ru…

…by-2-1-1 Commenting out the special behavior for Ruby v2.1.1
dresden-weekly · Feb 15, 2019 · 680b2e9 · 680b2e9
2 parents b0cc1d4 + 4532d53
commit 680b2e9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/ruby/rbenv/defaults/main.yml b/ruby/rbenv/defaults/main.yml
@@ -14,3 +14,6 @@ rbenv_rubies: []
 # - 2.1.5
 # - 2.2.0
 # - 2.2.1
+
+rbenv_ruby_libreadline_path: "{{ '/lib/{{ ansible_architecture }}-linux-gnu/libreadline.so.6' if ansible_os_family == 'Debian' else '/usr/lib64/libreadline.so' }}"
+rbenv_ruby_configure_opts: "{{ 'RUBY_CONFIGURE_OPTS=--with-readline-dir=\"{{ rbenv_ruby_libreadline_path }}\"' if ruby_version == '2.1.1' else '' }}"
diff --git a/ruby/rbenv/vars/Debian.yml b/ruby/rbenv/vars/Debian.yml
@@ -15,6 +15,3 @@ rbenv_package_names:
   - libffi-dev
   - libgdbm3
   - libgdbm-dev
-
-# only needed for ruby 2.1.1
-rbenv_ruby_configure_opts: 'RUBY_CONFIGURE_OPTS=--with-readline-dir="/lib/{{ ansible_architecture }}-linux-gnu/libreadline.so.6"'
diff --git a/ruby/rbenv/vars/RedHat.yml b/ruby/rbenv/vars/RedHat.yml
@@ -19,6 +19,3 @@ rbenv_package_names:
 
 # requires a seperate task that's run before any that installs EPEL packages
 rbenv_epel_repo: epel-release
-
-# only needed for rubies 2.1.0 and 2.1.1 on Ubuntu:
-# rbenv_ruby_configure_opts: 'RUBY_CONFIGURE_OPTS=--with-readline-dir="/usr/lib64/libreadline.so"'