Update nginx to NGINX and php to PHP

bin/install.sh

@@ -152,7 +152,7 @@ cp -a /tmp/easyengine/config/easyengine/ee.conf /etc/easyengine/ &>> $EE_INSTALL
 
 # Templates
 cp -a /tmp/easyengine/config/nginx /tmp/easyengine/templates/* /usr/share/easyengine/ &>> $EE_INSTALL_LOG \
-|| ee_lib_error "Unable to copy nginx sample files, exit status = " $?
+|| ee_lib_error "Unable to copy NGINX sample files, exit status = " $?
 
 # EasyEngine (ee) library and modules
 cp -a /tmp/easyengine/src/* /usr/local/lib/easyengine \

src/modules/system/install/ee_mod_install_php.sh

@@ -2,8 +2,8 @@
 
 function ee_mod_install_php()
 {
-	ee_lib_echo "Installing php5, please wait..."
+	ee_lib_echo "Installing PHP, please wait..."
 	$EE_APT_GET install php5-common php5-mysqlnd php5-xmlrpc \
 	php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt php5-xdebug \
-	php5-memcache memcached || ee_lib_error "Unable to install php5, exit status = " $?
+	php5-memcache memcached || ee_lib_error "Unable to install PHP5, exit status = " $?
 }

src/modules/system/install/ee_mod_repo_nginx.sh

@@ -5,16 +5,16 @@ function ee_mod_repo_nginx()
 	if [ "$EE_LINUX_DISTRO" == "Ubuntu" ];	then
 
 		# Add rtCamp nginx launchpad repository
-		ee_lib_echo "Adding rtCamp nginx launchpad repository, please wait..."
+		ee_lib_echo "Adding rtCamp NGINX launchpad repository, please wait..."
 		add-apt-repository -y ppa:rtcamp/nginx &>> $EE_COMMAND_LOG \
-		|| ee_lib_error "Unable to add rtCamp nginx launchpad repository, exit status = " $?
+		|| ee_lib_error "Unable to add rtCamp NGINX launchpad repository, exit status = " $?
 
 	elif [ "$EE_LINUX_DISTRO" == "Debian" ]; then
 
 		# Add Dotdeb nginx repository
-		ee_lib_echo "Adding Dotdeb nginx repository, please wait..."
+		ee_lib_echo "Adding Dotdeb NGINX repository, please wait..."
 		echo "deb http://packages.dotdeb.org $(lsb_release -c | awk '{print($2)}') all" > /etc/apt/sources.list.d/dotdeb-$(lsb_release -c | awk '{print($2)}').list \
-		|| ee_lib_error "Unable to add Dotdeb nginx repository, exit status = " $?
+		|| ee_lib_error "Unable to add Dotdeb NGINX repository, exit status = " $?
 
 		# Fetch and install dotdeb GnuPG key
 		ee_lib_dotdeb

src/modules/system/install/ee_mod_repo_php.sh

@@ -6,16 +6,16 @@ function ee_mod_repo_php()
 	if [ "$EE_LINUX_DISTRO" == "Ubuntu" ]; then
 
 		# Add ondrej php5 launchpad repository
-		ee_lib_echo "Adding ondrej php5 launchpad repository, please wait..."
+		ee_lib_echo "Adding Ondrej PHP5 launchpad repository, please wait..."
 		add-apt-repository -y ppa:ondrej/php5 &>> $EE_COMMAND_LOG \
 		|| ee_lib_error "Unable to add ondrej php5 launchpad repository, exit status = " $?
 
 	# Debian 6
 	elif [ $EE_DEBIAN_VERSION -eq 6 ]; then
 
-		ee_lib_echo "Adding Dotdeb php5.4 repository, please wait..."
+		ee_lib_echo "Adding Dotdeb PHP5.4 repository, please wait..."
-		echo "deb http://packages.dotdeb.org $(lsb_release -c | awk '{print($2)}')-php54 all" > /etc/apt/sources.list.d/dotdeb-$(lsb_release -c | awk '{print($2)}')-php54.list \
+		echo "deb http://packages.dotdeb.org $(lsb_release -c | awk '{print($2)}')-PHP54 all" > /etc/apt/sources.list.d/dotdeb-$(lsb_release -c | awk '{print($2)}')-php54.list \
-		|| ee_lib_error "Unable to add Dotdeb php5.4 repository, exit status = " $?
+		|| ee_lib_error "Unable to add Dotdeb PHP5.4 repository, exit status = " $?
 
 		# Fetch and install Dotdeb GnuPG key
 		ee_lib_dotdeb
@@ -23,9 +23,9 @@ function ee_mod_repo_php()
 	# Debian 7
 	elif [ $EE_DEBIAN_VERSION -eq 7 ]; then
 
-		ee_lib_echo "Adding Dotdeb php5.5 repository, please wait..."
+		ee_lib_echo "Adding Dotdeb PHP5.5 repository, please wait..."
-		echo "deb http://packages.dotdeb.org $(lsb_release -c | awk '{print($2)}')-php55 all" > /etc/apt/sources.list.d/dotdeb-$(lsb_release -c | awk '{print($2)}')-php55.list \
+		echo "deb http://packages.dotdeb.org $(lsb_release -c | awk '{print($2)}')-PHP55 all" > /etc/apt/sources.list.d/dotdeb-$(lsb_release -c | awk '{print($2)}')-php55.list \
-		|| ee_lib_error "Unable to add Dotdeb php5.5 repository, exit status = " $?
+		|| ee_lib_error "Unable to add Dotdeb PHP5.5 repository, exit status = " $?
 		
 		# Fetch and install dotdeb GnuPG key
 		ee_lib_dotdeb

src/modules/system/install/ee_mod_setup_nginx.sh

@@ -4,7 +4,7 @@ function ee_mod_setup_nginx()
 {
 	local ee_whitelist_ip_address
 	
-	ee_lib_echo "Setting up nginx, please wait..."
+	ee_lib_echo "Setting up NGINX, please wait..."
 
 	grep "EasyEngine" /etc/nginx/nginx.conf &> /dev/null
 	if [ $? -ne 0 ]; then

src/modules/system/install/ee_mod_setup_php.sh

@@ -2,11 +2,11 @@
 
 function ee_mod_setup_php()
 {
-	ee_lib_echo "Setting up php5, please wait..."
+	ee_lib_echo "Setting up PHP5, please wait..."
 
 	# Custom php5 log directory
 	if [ ! -d /var/log/php5/ ]; then
-		mkdir -p /var/log/php5/ || ee_lib_error "Unable to create /var/log/php5/, exit status = " $?
+		mkdir -p /var/log/php5/ || ee_lib_error "Unable to create /var/log/PHP5/, exit status = " $?
 	fi
 
 	grep "EasyEngine" /etc/php5/fpm/php.ini &> /dev/null

src/modules/system/remove/ee_mod_remove_php.sh

@@ -2,8 +2,8 @@
 
 function ee_mod_remove_php()
 {
-	ee_lib_echo "$EE_SECOND php5 package, please wait..."
+	ee_lib_echo "$EE_SECOND PHP5 package, please wait..."
 	$EE_APT_GET $EE_SECOND php5-common php5-mysqlnd php5-xmlrpc \
 	php5-curl php5-gd php5-cli php5-fpm php5-imap php5-mcrypt php5-xdebug \
-	php5-memcache memcached || ee_lib_error "Unable to $EE_SECOND php5, exit status = " $?
+	php5-memcache memcached || ee_lib_error "Unable to $EE_SECOND PHP5, exit status = " $?
 }