Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ def pip_command(command)

def pyenv_prerequisites
value_for_platform_family(
'debian' => %w(make libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev git) \
'debian' => %w(make libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev git) \
<< value_for_platform(
'debian' => { '>= 11' => 'python3-openssl', 'default' => 'python-openssl' },
'ubuntu' => { '>= 22.04' => 'python3-openssl', 'default' => 'python-openssl' },
'default' => 'python-openssl'
),
%w(rhel fedora amazon) => %w(git zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils),
%w(rhel fedora amazon) => %w(git zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel xz xz-devel libffi-devel findutils),
'suse' => %w(git git-core zlib-devel bzip2 libbz2-devel libopenssl-devel readline-devel sqlite3 sqlite3-devel xz xz-devel),
'mac_os_x' => %w(git readline xz)
)
Expand Down
6 changes: 3 additions & 3 deletions resources/python.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

command = %(pyenv install #{verbose} #{new_resource.version})

pyenv_script "#{command}" do
pyenv_script command.to_s do
code command
user new_resource.user
environment new_resource.environment
Expand All @@ -39,7 +39,7 @@
action :uninstall do
command = %(pyenv uninstall -f #{new_resource.version})

pyenv_script "#{command}" do
pyenv_script command.to_s do
code command
user new_resource.user
environment new_resource.environment
Expand All @@ -57,6 +57,6 @@ def python_installed?
end

def verbose
return '-v' if new_resource.verbose
'-v' if new_resource.verbose
end
end