saltstack-formulas/php-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #81 from babilen/set-composer-home

Browse Source 
Explicitly set HOME when running composer install.
This commit is contained in:
Forrest 2016-04-27 17:31:53 -07:00
commit 328224a63e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
php/composer.sls
View File

@ -1,6 +1,14 @@
{% from "php/map.jinja" import php with context %} {% from "php/map.jinja" import php with context %}
{% set install_file = php.local_bin + '/' + php.composer_bin %} {% set install_file = php.local_bin + '/' + php.composer_bin %}
{% if not salt['config.get']('sudo_user') %}
{% set salt_user = salt['config.get']('user', 'root') %}
{% else %}
{% set salt_user = salt['config.get']('sudo_user', 'root') %}
{% endif %}
{% set salt_user_home = salt['user.info'](salt_user).get('home', '/root') %}
include: include:
- php - php
@ -18,6 +26,8 @@ install-composer:
cmd.run: cmd.run:
- name: php {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }} - name: php {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }}
- unless: test -f {{ install_file }} - unless: test -f {{ install_file }}
- env:
- HOME: {{ salt_user_home }}
- require: - require:
- file: get-composer - file: get-composer
@ -32,5 +42,7 @@ update-composer:
- name: "{{ install_file }} selfupdate" - name: "{{ install_file }} selfupdate"
- unless: test $(grep --text COMPOSER_DEV_WARNING_TIME {{ install_file }} | egrep '^\s*define' | sed -e 's,[^[:digit:]],,g') \> $(php -r 'echo time();') - unless: test $(grep --text COMPOSER_DEV_WARNING_TIME {{ install_file }} | egrep '^\s*define' | sed -e 's,[^[:digit:]],,g') \> $(php -r 'echo time();')
- cwd: {{ php.local_bin }} - cwd: {{ php.local_bin }}
- env:
- HOME: {{ salt_user_home }}
- require: - require:
- cmd: install-composer - cmd: install-composer