From 01f89e116eaf1c6417ffe27079bba25d824a7f4c Mon Sep 17 00:00:00 2001
From: Mitesh Shah <Mitesh.Shah@rtcamp.com>
Date: Thu, 12 Dec 2013 17:46:08 +0530
Subject: [PATCH] Move command: ee system info -> ee info

---
 etc/bash_completion.d/ee  |  6 +++---
 usr/local/sbin/easyengine | 28 +++++++++++++---------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/etc/bash_completion.d/ee b/etc/bash_completion.d/ee
index a0102153..5a62bb97 100644
--- a/etc/bash_completion.d/ee
+++ b/etc/bash_completion.d/ee
@@ -1,4 +1,4 @@
-# Easy Engine Auto Complete Feature
+# EasyEngine Auto Complete Feature
 
 
 
@@ -18,12 +18,12 @@ EEAUTO()
 
 		# List Of Suggested Words
 		easyengine|ee)
-			COMPREPLY=( $(compgen -W "help version system site" -- $CURRENT) )
+			COMPREPLY=( $(compgen -W "info help version system site" -- $CURRENT) )
 			return 0
 			;;
 
 		system)
-			COMPREPLY=( $( compgen -W "install remove purge info" -- $CURRENT ) )
+			COMPREPLY=( $( compgen -W "install remove purge" -- $CURRENT ) )
 			return 0
 			;;
 
diff --git a/usr/local/sbin/easyengine b/usr/local/sbin/easyengine
index 262b6aa7..c2e22f69 100755
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@@ -643,7 +643,7 @@ SYSTEMINFO()
 	PHPREQUESTTERMINATE=$(grep ^request_terminate_timeout /etc/php5/fpm/pool.d/www.conf | cut -d'=' -f2| cut -d' ' -f2)
 	PHPFASTCGIREQUEST=$(grep ^listen /etc/php5/fpm/pool.d/www.conf | cut -d'=' -f2| cut -d' ' -f2)
 
-	echo -e "\033[34m\n\n PHP ($PHPVER) Information:\n\e[0m"
+	echo -e "\033[34m\n\nPHP ($PHPVER) Information:\n\e[0m"
 	echo -e "\033[34mPHP User:\t\t\t \033[37m$PHPUSER\e[0m"
 	echo -e "\033[34mPHP expose_php:\t\t\t \033[37m$PHPEXPOSE\e[0m"
 	echo -e "\033[34mPHP post_max_size:\t\t \033[37m$PHPPOSTMAXSIZE\e[0m"
@@ -1023,21 +1023,26 @@ REMOVENGINXCONF()
 }
 
 
+# Easy Engine Version
+if [ "$1" = "-v" ] || [ "$1" = "version" ] || [ "$1" = "--version" ]
+then
+
+	# Display Easy Engine Version
+	echo "easyengine version: 1.0.0"
+
 # Easy Engine Help
-if [ "$1" = "-h" ] || [ "$1" = "help" ] || [ "$1" = "--help" ]
+elif [ "$1" = "-h" ] || [ "$1" = "help" ] || [ "$1" = "--help" ]
 then
 
 	# Display Man Pages
 	man ee
 
-
-# Easy Engine Version
-elif [ "$1" = "-v" ] || [ "$1" = "version" ] || [ "$1" = "--version" ]
+# Easy Engine Info
+elif [ "$1" = "info" ]
 then
 
-	# Display Easy Engine Version
-	echo "easyengine version: 1.0.0"
-
+		# Get Nginx PHP & MySQL Information
+		SYSTEMINFO
 
 # Easy Engine System Settings
 elif [ "$1" = "system" ]
@@ -1380,13 +1385,6 @@ then
 
 		fi
 
-	# Easy Engine Info
-	elif [ "$2" = "info" ]
-	then
-
-		# Get Nginx PHP & MySQL Information
-		SYSTEMINFO
-
 	fi