Simplify installation on debian-like systems, make python2 support optional

Author: katyukha

CHANGELOG.md

@@ -19,6 +19,8 @@
   In previous version latest stable version was installed by default.
 - [openupgradelib](https://github.com/OCA/openupgradelib) now will be downloaded from pypi.
   It seems that now relevant versions of this lib are published on pypi
+- Simplify installation for debian-like systems: automatically install preprequirements
+- Python2 support is not installed only for Odoo 10.0 and below.
 
 
 ## Release 0.12.1 (2021-10-25)

install-system.bash

@@ -30,8 +30,13 @@ set -e;  # Fail on each error
 
 # Install git if not installed yet
 if ! command -v git >/dev/null 2>&1 || ! command -v wget >/dev/null 2>&1; then
-    echo -e "${BLUEC}INFO${NC}: Installing minimal system dependencies...${NC}";
-    apt-get install -yqq --no-install-recommends git wget;
+    if [ -e "/etc/debian_version" ]; then
+        echo -e "${BLUEC}INFO${NC}: Installing minimal system dependencies...${NC}";
+        apt-get install -yqq --no-install-recommends git wget;
+    else
+        echo -e "${REDC}ERROR${NC}: Please, install wget and git to be able to install odoo-helper-scripts!"
+        exit 2;
+    fi
 fi
 
 # define vars
@@ -73,13 +78,21 @@ for oh_cmd in $ODOO_HELPER_BIN/*; do
     fi
 done
 
+
+if [ -e "/etc/debian_version" ]; then
+    odoo-helper install pre-requirements;
+    ODOO_HELPER_PRE_REQUIREMENTS_INSTALLED=1;
+fi
+
 echo -e "${YELLOWC}odoo-helper-scripts${GREENC} seems to be successfully installed system-wide!${NC}";
 echo -e "Install path is ${YELLOWC}${INSTALL_PATH}${NC}";
 echo;
-echo -e "${YELLOWC}NOTE${NC}: Do not forget to install odoo-helper system dependencies.";
-echo -e "To do this for debian-like systems run following command (${YELLOWC}sudo access required${NC}):";
-echo -e "    $ ${BLUEC}odoo-helper install pre-requirements${NC}";
-echo;
+if [ -z "$ODOO_HELPER_PRE_REQUIREMENTS_INSTALLED" ]; then
+    echo -e "${YELLOWC}NOTE${NC}: Do not forget to install odoo-helper system dependencies.";
+    echo -e "To do this for debian-like systems run following command (${YELLOWC}sudo access required${NC}):";
+    echo -e "    $ ${BLUEC}odoo-helper install pre-requirements${NC}";
+    echo;
+fi
 echo -e "${YELLOWC}NOTE2${NC}: Do not forget to install and configure postgresql.";
 echo -e "To do this for debian-like systems run following command (${YELLOWC}sudo access required${NC}):";
 echo -e "    $ ${BLUEC}odoo-helper install postgres${NC}";

lib/install.bash

@@ -213,6 +213,8 @@ function install_wkhtmltopdf {
         read -ra wkhtmltox_deps < <(dpkg -f "$wkhtmltox_path" Depends | sed -r 's/,//g');
         if ! (install_sys_deps_internal "${wkhtmltox_deps[@]}" && with_sudo dpkg -i "$wkhtmltox_path"); then
             echoe -e "${REDC}ERROR:${NC} Error caught while installing ${BLUEC}wkhtmltopdf${NC}.";
+            rm "$wkhtmltox_path" || true;  # try to remove downloaded file, ignore errors
+            return 2;
         fi
 
         rm "$wkhtmltox_path" || true;  # try to remove downloaded file, ignore errors
@@ -402,6 +404,12 @@ function install_sys_deps_for_odoo_version {
         return 1;
     fi
 
+    local odoo_major_version="${odoo_version%.*}";
+    if [ "$odoo_major_version" -lt 11 ]; then
+        # We have to install python2 support for odoo versions less than 11.0
+        install_python2_support;
+    fi
+
     odoo_branch=${odoo_branch:-$odoo_version};
     local control_url="https://raw.githubusercontent.com/odoo/odoo/$odoo_branch/debian/control";
     local tmp_control;
@@ -588,6 +596,17 @@ function install_and_configure_postgresql {
 }
 
 
+function install_python2_support {
+    echo -e "${BLUEC}Installing python2 dependencies (to support odoo 10 and below)...${NC}";
+    if ! install_sys_deps_internal python2-dev python2-pip-whl; then
+        echo -e "${YELLOWC}WARNING${NC}: It seems that it is too old version of OS, trying old version of python2 support...";
+        if ! install_sys_deps_internal python-dev; then
+            echo -e "${YELLOWC}WARNING${NC}: Cannot install python2 support... skipping...";
+        fi
+    fi
+}
+
+
 # install_system_prerequirements
 function install_system_prerequirements {
     local usage="
@@ -634,15 +653,9 @@ function install_system_prerequirements {
         libsasl2-dev libldap2-dev libssl-dev libffi-dev fontconfig \
         libmagic1 python3-virtualenv;
 
-    echo -e "${BLUEC}Installing python2 dependencies (to support odoo 10 and below)...${NC}";
-    if ! install_sys_deps_internal python2-dev python2-pip-whl; then
-        echo -e "${YELLOWC}WARNING${NC}: It seems that it is too old version of OS, trying old version of python2 support...";
-        if ! install_sys_deps_internal python-dev; then
-            echo -e "${YELLOWC}WARNING${NC}: Cannot install python2 support... skipping...";
-        fi
-    fi
     if ! install_wkhtmltopdf; then
         echoe -e "${YELLOWC}WARNING:${NC} Cannot install ${BLUEC}wkhtmltopdf${NC}!!! Skipping...";
+        echoe -e "${LBLUEC}HINT:${NC} If your system has wkhtmltopdf>=0.12.5 then try to install system package.";
     fi
 }
 

lib/system.bash

@@ -64,6 +64,8 @@ function system_update_odoo_helper_scripts {
             fi
         fi
     done
+
+    echoe -e "${LBLUEC}HINT${NC}: Update pre-requirements to ensure all system dependencies are installed.";
     cd "$cdir";
 }