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

remove curl dependency in favor of saltstack file.managed and use the composer instlaller.

Browse Source
This commit is contained in:
Hayden King 2015-07-19 18:00:44 -05:00
parent 08f615e36b
commit f3e4197fcb
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
php/composer.sls
View File

@ -1,23 +1,24 @@
{% from "php/map.jinja" import php with context %} {% from "php/map.jinja" import php with context %}
{% set install_file = php.local_bin + '/composer' %} {% set install_file = php.local_bin + '/' + php.composer_bin %}
include: include:
- php - php
get-composer: get-composer:
cmd.run: file.managed:
- name: 'CURL=`which curl`; $CURL -sS https://getcomposer.org/installer | php' - name: {{ php.temp_dir }}/installer
- mode: 0755
- unless: test -f {{ install_file }} - unless: test -f {{ install_file }}
- cwd: {{ php.temp_dir }} - source: https://getcomposer.org/installer
- source_hash: {{ php.composer_hash }}
- require: - require:
- pkg: php - pkg: php
install-composer: install-composer:
cmd.wait: cmd.wait:
- name: mv {{ php.temp_dir }}/composer.phar {{ install_file }} - name: {{ php.temp_dir }}/installer --filename={{ php.composer_bin }} --install-dir={{ php.local_bin }}
- cwd: {{ php.temp_dir }}
- watch: - watch:
- cmd: get-composer - file: get-composer
# Get COMPOSER_DEV_WARNING_TIME from the installed composer, and if that time has passed # Get COMPOSER_DEV_WARNING_TIME from the installed composer, and if that time has passed
# then it's time to run `composer selfupdate` # then it's time to run `composer selfupdate`
@ -29,6 +30,6 @@ update-composer:
cmd.run: cmd.run:
- 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.temp_dir }} - cwd: {{ php.local_bin }}
- require: - require:
- cmd: install-composer - cmd: install-composer