Merge branch 'master' into doctor

11 years ago · fbe14f5ff4
1 changed files with 3 additions and 3 deletions
--- a/usr/local/sbin/easyengine
+++ b/usr/local/sbin/easyengine
@ -1230,7 +1230,7 @@ if [ "$1" = "version" ] || [ "$1" = "--version" ] || [ "$1" = "-v" ]
 then

 	# Display Easy Engine Version
-	echo "easyengine version: 1.2"
+	echo "easyengine version: 1.2.1"

 # Easy Engine Info
 elif [ "$1" = "info" ]
@ -1255,11 +1255,11 @@ then
 	APTASSUMEYES

 	# Define Nginx Package
-	if [ -f /etc/lsb-release ]
+	if [ "$LINUX_DISTRO" == "Ubuntu" ]
 	then
 		NGINXPACKAGE=nginx-custom

-	elif [ -f /etc/debian_version ]
+	elif [ "$LINUX_DISTRO" == "Debian" ]
 	then
 		NGINXPACKAGE=nginx-full
 	fi