@@ -58,14 +58,14 @@ readonly ee_distro_version=$(lsb_release -sc)
5858if [ " $ee_linux_distro " != " Ubuntu" ] && [ " $ee_linux_distro " != " Debian" ]; then
5959 ee_lib_echo_fail " EasyEngine (ee) is made for Ubuntu and Debian only as of now"
6060 ee_lib_echo_fail " You are free to fork EasyEngine (ee): https://github.com/EasyEngine/easyengine/fork"
61- ee_lib_echo_fail " EasyEngine (ee) only support Ubuntu 12 .04/14 .04 and Debian 7.x/8.x"
61+ ee_lib_echo_fail " EasyEngine (ee) only support Ubuntu 14 .04/16.04/18 .04 and Debian 7.x/8.x"
6262 exit 100
6363fi
6464
6565# EasyEngine (ee) only support all Ubuntu/Debian distro except the distro reached EOL
66- lsb_release -d | egrep -e " 12 .04|14 .04|16 .04|wheezy|jessie" & >> /dev/null
66+ lsb_release -d | egrep -e " 14 .04|16 .04|18 .04|wheezy|jessie" & >> /dev/null
6767if [ " $? " -ne " 0" ]; then
68- ee_lib_echo_fail " EasyEngine (ee) only support Ubuntu 12 .04/14 .04/16 .04 LTS and Debian 7.x/8.x"
68+ ee_lib_echo_fail " EasyEngine (ee) only support Ubuntu 14 .04/16 .04/18 .04 LTS and Debian 7.x/8.x/9 .x"
6969 exit 100
7070fi
7171
8888function ee_install_dep()
8989{
9090 if [ " $ee_linux_distro " == " Ubuntu" ]; then
91- apt-get -y install gcc curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties software-properties-common || ee_lib_error " Unable to install pre depedencies, exit status " 1
91+ apt-get -y install build-essential curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar software-properties-common || ee_lib_error " Unable to install pre depedencies, exit status " 1
9292 elif [ " $ee_linux_distro " == " Debian" ]; then
93- apt-get -y install gcc curl gzip python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties || ee_lib_error " Unable to pre depedencies, exit status " 1
93+ apt-get -y install build-essential curl gzip dirmngr python3 python3-apt python3-setuptools python3-dev sqlite3 git tar python-software-properties || ee_lib_error " Unable to pre depedencies, exit status " 1
9494 fi
9595
9696 # Generating Locale
@@ -761,8 +761,11 @@ if [ -f /usr/local/sbin/easyengine ]; then
761761 ee_lib_error " Not updating EasyEngine to $ee_version_new , exit status = " 1
762762 fi
763763elif [ ! -f /usr/local/bin/ee ]; then
764+ ee_lib_echo " Installing depedencies" | tee -ai $ee_install_log
764765 ee_install_dep | tee -ai $ee_install_log
766+ ee_lib_echo " Installing EasyEngine $ee_branch " | tee -ai $ee_install_log
765767 ee_install | tee -ai $ee_install_log
768+ ee_lib_echo " Running post-install steps" | tee -ai $ee_install_log
766769 secure_ee_db | tee -ai $EE_INSTALL_LOG
767770 ee_git_init | tee -ai $ee_install_log
768771
0 commit comments