diff options
| author | Fotis Gimian <fgimiansoftware@gmail.com> | 2013-06-04 11:25:48 +1000 |
|---|---|---|
| committer | Fotis Gimian <fgimiansoftware@gmail.com> | 2013-06-04 11:25:48 +1000 |
| commit | 8608958fe1bb7fec4bb75c65bd6b1f1e236e88bd (patch) | |
| tree | daf75da3ed8ee4bf7de16d007ef5de9b766817f8 /manifests | |
| parent | 17debdc04506a2bfd4297b7620acffdbd01c9176 (diff) | |
Removed unnecessary which commands for obtaining the pip and python executables
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/pip.pp | 2 | ||||
| -rw-r--r-- | manifests/requirements.pp | 2 | ||||
| -rw-r--r-- | manifests/virtualenv.pp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/pip.pp b/manifests/pip.pp index a9805d3..ddbcd6f 100644 --- a/manifests/pip.pp +++ b/manifests/pip.pp @@ -58,7 +58,7 @@ define python::pip ( } $pip_env = $virtualenv ? { - 'system' => '`which pip`', + 'system' => 'pip', default => "${virtualenv}/bin/pip", } diff --git a/manifests/requirements.pp b/manifests/requirements.pp index 789c0d3..ba16d1e 100644 --- a/manifests/requirements.pp +++ b/manifests/requirements.pp @@ -50,7 +50,7 @@ define python::requirements ( } $pip_env = $virtualenv ? { - 'system' => '`which pip`', + 'system' => 'pip', default => "${virtualenv}/bin/pip", } diff --git a/manifests/virtualenv.pp b/manifests/virtualenv.pp index f45678b..7fbf25e 100644 --- a/manifests/virtualenv.pp +++ b/manifests/virtualenv.pp @@ -95,7 +95,7 @@ define python::virtualenv ( } exec { "python_virtualenv_${venv_dir}": - command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv -p `which ${python}` ${system_pkgs_flag} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade ${distribute_pkg} pip", + command => "mkdir -p ${venv_dir} ${proxy_command} && virtualenv ${system_pkgs_flag} ${venv_dir} && ${venv_dir}/bin/pip --log-file ${venv_dir}/pip.log install ${pypi_index} ${proxy_flag} --upgrade ${distribute_pkg} pip", user => $owner, creates => "${venv_dir}/bin/activate", path => [ '/bin', '/usr/bin', '/usr/sbin' ], |