Browse Source

Remove kohana bash profile

Hamilton Turner 10 years ago
parent
commit
480a8642f6

+ 0 - 7
frameworks/PHP/php-kohana/bash_profile.sh

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

+ 3 - 0
frameworks/PHP/php-kohana/install.sh

@@ -3,6 +3,9 @@
 fw_depends php nginx composer
 
 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 $IROOT/composer.phar install \
   --no-interaction --working-dir $TROOT \
   --no-progress --optimize-autoloader 

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

@@ -1,10 +1,14 @@
 #!/bin/bash
 
+export PHP_HOME=${IROOT}/php-5.5.17
+export PHP_FPM=$PHP_HOME/sbin/php-fpm
+export NGINX_HOME=${IROOT}/nginx
+export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
+
 sed -i 's|localhost|'"${DBHOST}"'|g' application/config/database.php
 sed -i 's|root .*/FrameworkBenchmarks/php-kohana|root '"${TROOT}"'|g' deploy/nginx.conf
 sed -i 's|/usr/local/nginx/|'"${IROOT}"'/nginx/|g' deploy/nginx.conf
 
-export PATH="$PHP_HOME/bin:$PHP_HOME/sbin:$PATH"
 
 $PHP_FPM --fpm-config $FWROOT/config/php-fpm.conf -g $TROOT/deploy/php-fpm.pid
 $NGINX_HOME/sbin/nginx -c $TROOT/deploy/nginx.conf