diff --git a/scripts/install b/scripts/install index c3f905d..52c46b7 100644 --- a/scripts/install +++ b/scripts/install @@ -81,23 +81,25 @@ sudo chown -R www-data:www-data $tmp sudo chmod -R 755 $tmp # Prepare composer and cache directories -sudo mkdir -p /opt/flarum_composer/cache -sudo chown -R www-data:www-data /opt/flarum_composer -sudo chmod -R 755 /opt/flarum_composer +compo=/opt/${app}_composer +sudo mkdir -p $compo/cache +sudo chown -R www-data:www-data $compo +sudo chmod -R 755 $compo ### composer ### -if ! type "composer" > /dev/null; then +#if ! type "composer" > /dev/null; then # Install composer (https://getcomposer.org) EXPECTED_SIGNATURE=$(wget https://composer.github.io/installer.sig -O - -q) - sudo su - www-data -s /bin/bash -c "php -r \"copy('https://getcomposer.org/installer', '$tmp/composer-setup.php');\"" - ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', '$tmp/composer-setup.php');") + sudo php -r "copy('https://getcomposer.org/installer', '$compo/composer-setup.php');" + ACTUAL_SIGNATURE=$(php -r "echo hash_file('SHA384', '$compo/composer-setup.php');") if [ "$EXPECTED_SIGNATURE" = "$ACTUAL_SIGNATURE" ] then - sudo su - root -c "grep -q -F 'env[COMPOSER_HOME]= /opt/flarum_composer' /etc/php5/fpm/pool.d/${app}.conf || sudo echo 'env[COMPOSER_HOME]= /opt/flarum_composer' >> /etc/php5/fpm/pool.d/${app}.conf" - sudo service php5-fpm reload - sudo su - www-data -s /bin/bash -c "php $tmp/composer-setup.php --install-dir=$tmp --filename=composer" - sudo mv $tmp/composer /usr/local/bin - sudo chown root:root /usr/local/bin/composer +# sudo grep -q -F 'env[COMPOSER_HOME]= $compo' /etc/php5/fpm/pool.d/${app}.conf || sudo echo 'env[COMPOSER_HOME]= /opt/flarum_c$ +# sudo service php5-fpm reload +# echo "php reload" + sudo php $compo/composer-setup.php --install-dir=$compo --filename=composer +# sudo mv /opt/flarum_composer/composer /usr/local/bin +# sudo chown root:root /usr/local/bin/composer RESULT=$? else >&2 echo 'ERROR: Invalid installer signature' @@ -105,10 +107,9 @@ if ! type "composer" > /dev/null; then fi if [ $RESULT != 0 ] then - sudo rm -rf $final_path - exit $RESULT + ynh_die fi -fi +#fi ### composer end ### ### Install flarum