Browse Source

remove bash_profile.sh and update install.sh for symfony2

Lita Gratrix 10 years ago
parent
commit
b18e85be27

+ 0 - 9
frameworks/PHP/php-pimf/bash_profile.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-export PHP_HOME=${IROOT}/php-5.5.17
-
-export PHP_FPM=$PHP_HOME/sbin/php-fpm
-
-export COMPOSER_HOME=${IROOT}/php-composer
-
-export NGINX_HOME=${IROOT}/nginx

+ 6 - 5
frameworks/PHP/symfony2/install.sh

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

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

@@ -1,13 +1,13 @@
 #!/bin/bash
 #!/bin/bash
+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
 
 
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|database_host: .*|database_host: '"${DBHOST}"'|g' app/config/parameters.yml
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|root .*/FrameworkBenchmarks/php-symfony2| root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|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 \
 ${PHP_HOME}/bin/php app/console cache:clear \
   --env=prod --no-debug --no-warmup
   --env=prod --no-debug --no-warmup
 ${PHP_HOME}/bin/php app/console cache:warmup \
 ${PHP_HOME}/bin/php app/console cache:warmup \