Commit 33b2b9cc authored by helmo's avatar helmo

Set composer to be recomended, warn when missing

parent 9e8b8b3e
......@@ -51,18 +51,9 @@ case "$1" in
# fix permissions on installed directories
chown aegir:aegir "$VARLIB"
db_get "aegir/composer_version"
# Warn about missing composer, requiring it would break Jessie since it has no such package.
command -v composer >/dev/null 2>&1 || { echo "WARNING: System is missing PHP composer, please install a Debian package or see https://getcomposer.org/" >&2; }
if [ "$COMPOSER_VERSION" = "stable" ]; then
# Install composer.
COMPOSER_HOME="$HOME/.composer"
curl -sS https://getcomposer.org/installer | php
mv composer.phar /usr/local/bin/composer
# Add composer's bin dir to the $PATH.
# TODO: This should be made idempotent.
echo "export PATH=\"\$HOME/.composer/vendor/bin:\$PATH\"" >> ~aegir/.bashrc
fi
db_get "aegir/drush_version"
DRUSH_VERSION="$RET"
......@@ -112,6 +103,9 @@ case "$1" in
# Symlink Drush for other users to use.
ln -s ~aegir/.composer/vendor/bin/drush /usr/local/bin
# Add composer's bin dir to the $PATH.
# TODO: This should be made idempotent.
echo "export PATH=\"\$HOME/.composer/vendor/bin:\$PATH\"" >> ~aegir/.bashrc
fi
fi
......
......@@ -12,7 +12,7 @@ Vcs-browser: http://drupalcode.org/project/provision.git
Package: aegir3-provision
Architecture: all
Depends: ${misc:Depends}, php5-cli (>= 5.3) | php7.0-cli | php7.1-cli, php5 | php7.0-xml | php7.1-xml, php5-mysql | php7.0-mysql | php7.1-mysql, mysql-client | mariadb-client, sudo, postfix | mail-transport-agent, apache2 | nginx, adduser, ucf, curl
Recommends: mysql-server | mariadb-server, rsync
Recommends: mysql-server | mariadb-server, rsync, composer
Conflicts: aegir-provision, aegir-provision2, aegir2-provision
Replaces: aegir-provision, aegir-provision2, aegir2-provision
Description: mass Drupal hosting system - backend
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment