more debug output and try to fix path when odoo is in an egg

also changed tabs to spaces

start

@@ -26,5 +26,5 @@
 # First test if odoo command exists
 case $ODOO_TYPE in
     odoo7 | odoo8)
-	odoo_command=openerp-server
+        odoo_command=openerp-server
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
@@ -30,3 +30,3 @@
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
-	;;
+        ;;
     odoo10)
@@ -32,3 +32,3 @@
     odoo10)
-	odoo_command=odoo-bin
+        odoo_command=odoo-bin
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
@@ -34,3 +34,3 @@
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
-	;;
+        ;;
     odoo11)
@@ -36,6 +36,6 @@
     odoo11)
-	odoo_command=odoo
-	;;
+        odoo_command=odoo
+        ;;
 esac
 echo "DEBUG - Trying odoo command $odoo_command"
 if [ -x "$(command -v $odoo_command)" ];
@@ -56,18 +56,10 @@
     odoo_bin=$odoo_command
     if test -z "$module_path";
     then
-    echo "DEBUG - No odoo found by using module path"
-    virtualenv_name=$(basename $(readlink -f $(dirname start)))
-    echo "DEBUG - Trying $virtualenv_name virtualenvwrapper"
-    # assume you use virtualenvwrapper, and try the same env name as the project
-    venv_python=$WORKON_HOME/$virtualenv_name/bin/python
-    if [ -e "$venv_python" ];
-    then
-        module_path=$($venv_python -B -c "$print_statement" 2> /dev/null)
-    fi
-    if test -z "$module_path";
-    then
-        echo "DEBUG - No odoo found by using virtuenvwrapper"
-        echo "DEBUG - Trying in /opt/odoo/sources/odoo"
-        if test -e "/opt/odoo/sources/odoo/$odoo_bin";
+        echo "DEBUG - No odoo found by using module path"
+        virtualenv_name=$(basename $(readlink -f $(dirname start)))
+        echo "DEBUG - Trying $virtualenv_name virtualenvwrapper"
+        # assume you use virtualenvwrapper, and try the same env name as the project
+        venv_python=$WORKON_HOME/$virtualenv_name/bin/python
+        if [ -e "$venv_python" ];
         then
@@ -73,7 +65,15 @@
         then
-            echo "DEBUG - Found in /opt/odoo/sources/odoo"
-            odoo_bin=/opt/odoo/sources/odoo/$odoo_bin
-	    module_path="/opt/odoo/sources/odoo/odoo/__init__.py"
+            module_path=$($venv_python -B -c "$print_statement" 2> /dev/null)
+        fi
+        if test -z "$module_path";
+        then
+            echo "DEBUG - No odoo found by using virtuenvwrapper"
+            echo "DEBUG - Trying in /opt/odoo/sources/odoo"
+            if test -e "/opt/odoo/sources/odoo/$odoo_bin";
+            then
+                echo "DEBUG - Found in /opt/odoo/sources/odoo"
+                odoo_bin=/opt/odoo/sources/odoo/$odoo_bin
+                module_path="/opt/odoo/sources/odoo/odoo/__init__.py"
             else
                 echo "FATAL - No odoo found"
                 echo "INFO - Maybe you forgot to activate your environment?"
@@ -83,10 +83,10 @@
             echo "DEBUG - Odoo found by using virtuenvwrapper"
         fi
     else
-        echo "DEBUG - Odoo found by using module path"
+        echo "DEBUG - Odoo found by using module path ($odoo_bin)"
     fi
 
     odoo=$(dirname $(dirname $module_path))
     
     if expr match $odoo  ^.*\.egg$ ;
     then
@@ -87,8 +87,8 @@
     fi
 
     odoo=$(dirname $(dirname $module_path))
     
     if expr match $odoo  ^.*\.egg$ ;
     then
-        odoo="/usr/local/bin"
+        odoo_bin="/usr/local/bin/$odoo_command"
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
@@ -94,4 +94,5 @@
         odoo_addons_path=${ODOO_ADDONS_PATH:-/opt/odoo/sources/odoo}
+        echo "DEBUG - Module path is an egg, changing path ($odoo_bin)"
     else
         odoo_addons_path=${ODOO_ADDONS_PATH:-$odoo}
     fi
@@ -125,6 +126,6 @@
         then
             addons_path="--addons-path=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$HOME/src/openobject-server/openerp/addons','$HOME/src/openobject-addons','$HOME/src/openerp-web/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")"
         else
-	    if [ "$ODOO_TYPE" = "odoo7" ] || [ "$ODOO_TYPE" = "odoo8" ] || [ "$ODOO_TYPE" = "odoo10" ];
-	    then
+            if [ "$ODOO_TYPE" = "odoo7" ] || [ "$ODOO_TYPE" = "odoo8" ] || [ "$ODOO_TYPE" = "odoo10" ];
+            then
                 pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo_addons_path/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")
@@ -130,3 +131,3 @@
                 pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['$odoo_addons_path/addons']+['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")
-	    else
+            else
                 pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")
@@ -132,5 +133,5 @@
                 pathes=$($python -B -c "from six.moves import configparser ; import os ; c = configparser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print(','.join(['${project_home}/'+line for line in set(os.path.dirname(path) for path in c.get('odoo_scripts', 'modules').split())]))")
-	    fi
+            fi
             if [ -n "$pathes" ];
             then
                 addons_path="--addons-path=$pathes"