Minor Update

src/lib/ee_lib_variables.sh

@@ -1,5 +1,11 @@
 # Define global variables
 
+# WP-CLI version
+readonly EE_WP_CLI_VERSION='0.15.1'
+
+# Adminer version
+readonly EE_ADMINER_VERSION='4.1.0'
+
 readonly EE_LOG_DIR=/var/log/easyengine
 readonly EE_COMMAND_LOG=/var/log/easyengine/ee.log
 readonly EE_ERROR_LOG=/var/log/easyengine/error.log
@@ -8,8 +14,7 @@ readonly EE_CONFIG_GET=$(echo "git config --file /etc/easyengine/ee.conf")
 readonly EE_CONFIG_SET=$(echo "git config --file /etc/easyengine/ee.conf" --replace-all)
 readonly EE_IP_ADDRESS=$($EE_CONFIG_GET system.ip-address | cut -d'=' -f2 | sed 's/ //g' | tr ',' '\n')
 readonly EE_APT_GET=$($EE_CONFIG_GET system.apt-get-assume-yes | grep -i true &> /dev/null && echo apt-get -y || echo apt-get)
-readonly EE_WPCLI_VERSION='0.15.1'
-readonly EE_ADMINER_VERSION='4.1.0'
+
 
 # Distribution specific variable
 if [ "$EE_LINUX_DISTRO" == "Ubuntu" ];	then

src/modules/system/install/ee_mod_install_postfix.sh

@@ -7,6 +7,6 @@ function ee_mod_install_postfix()
 	debconf-set-selections <<< "postfix postfix/mailname string $(hostname -f)"
 
 	# Install Postfix
-	ee_lib_echo "Installing Postfix, Please Wait..."
-	$EE_APT_GET install postfix || ee_lib_error "Unable to install postfix, exit status = " $?
+	ee_lib_echo "Installing Postfix, please wait..."
+	$EE_APT_GET install postfix || ee_lib_error "Unable to install Postfix, exit status = " $?
 }

src/vendor/ee_ven_install_adminer.sh

@@ -12,5 +12,6 @@ function ee_ven_install_adminer()
 		ee_lib_echo "Downloading Adminer, please wait..."
 		wget --no-check-certificate -cqO /var/www/22222/htdocs/db/adminer/index.php http://downloads.sourceforge.net/adminer/adminer-${EE_ADMINER_VERSION}.php \
 		|| ee_lib_error "Unable to download Adminer, exit status = " $?
+
 	fi
 }

src/vendor/ee_ven_install_pma.sh

@@ -2,8 +2,7 @@
 
 function ee_ven_install_pma()
 {
-	if [ ! -d /var/www/22222/htdocs/db/pma ]
-	then
+	if [ ! -d /var/www/22222/htdocs/db/pma ]; then
 
 		# Setup phpMyAdmin
 		mkdir -p /var/www/22222/htdocs/db/pma/ \

src/vendor/ee_ven_install_wp_cli.sh

@@ -2,10 +2,11 @@
 
 function ee_ven_install_wp_cli()
 {
-	if [ ! -d /usr/share/wp-cli ]
-	then
+	if [ ! -d /usr/share/wp-cli ]; then
+
 		ee_lib_echo "Installing WP-CLI, please wait..."
-		curl -sL https://raw.github.com/wp-cli/wp-cli.github.com/master/installer.sh | INSTALL_DIR='/usr/share/wp-cli' VERSION=$EE_WPCLI_VERSION bash &>> $EE_COMMAND_LOG \
+		curl -sL https://raw.github.com/wp-cli/wp-cli.github.com/master/installer.sh \
+		| INSTALL_DIR='/usr/share/wp-cli' VERSION=$EE_WP_CLI_VERSION bash &>> $EE_COMMAND_LOG \
 		|| ee_lib_error "Unable to install WP-CLI, exit status = " $?
 
 		# Add WP-CLI command in $PATH variable