浏览代码

Update install.sh for symphony2-stripped

Lita Gratrix 10 年之前
父节点
当前提交
5e9514dd44
共有 2 个文件被更改,包括 7 次插入8 次删除
  1. 4 4
      frameworks/PHP/symfony2-stripped/install.sh
  2. 3 4
      frameworks/PHP/symfony2-stripped/setup.sh

+ 4 - 4
frameworks/PHP/symfony2-stripped/install.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
-
-fw_depends php composer nginx
-
 export PHP_HOME=${IROOT}/php-5.5.17
+export COMPOSER_HOME=${IROOT}/php-composer
 export PHP_FPM=$PHP_HOME/sbin/php-fpm
 export NGINX_HOME=${IROOT}/nginx
 
-${PHP_HOME}/bin/php $IROOT/composer.phar install \
+fw_depends php composer nginx
+
+${PHP_HOME}/bin/php $COMPOSER_HOME/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 

+ 3 - 4
frameworks/PHP/symfony2-stripped/setup.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
+export PHP_HOME=${IROOT}/php-5.5.17
+export PHP_FPM=$PHP_HOME/sbin/php-fpm
+export NGINX_HOME=${IROOT}/nginx
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2-stripped| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PHP_HOME=${IROOT}/php-5.5.17
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-export NGINX_HOME=${IROOT}/nginx
-
 ${PHP_HOME}/bin/php app/console cache:clear \
   --env=prod --no-debug --no-warmup
 ${PHP_HOME}/bin/php app/console cache:warmup \