Browse Source

remove bash_profile.sh and update install.sh for php-pixie

Lita Gratrix 10 years ago
parent
commit
51da5ed419

+ 0 - 9
frameworks/PHP/php-phpixie/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

+ 1 - 1
frameworks/PHP/php-phpixie/install.sh

@@ -1 +1 @@
-#!/bin/bash

fw_depends php composer nginx
+#!/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

fw_depends php nginx composer

${PHP_HOME}/bin/php ${COMPOSER_HOME}/composer.phar install \
  --no-interaction --working-dir $TROOT \
  --no-progress --optimize-autoloader 

+ 5 - 1
frameworks/PHP/php-phpixie/setup.sh

@@ -1,5 +1,10 @@
 #!/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|localhost|'"${DBHOST}"'|g' assets/config/db.php
 sed -i 's|".*/FrameworkBenchmarks/php-phpixie|"'"${TROOT}"'|g' deploy/php-phpixie
 sed -i 's|Directory .*/FrameworkBenchmarks/php-phpixie|Directory '"${TROOT}"'|g' deploy/php-phpixie
@@ -8,6 +13,5 @@ sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
 export PATH="$COMPOSER_HOME:$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
 
-composer.phar install --optimize-autoloader
 $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf