Merge branch 'revert_osx_fix_and_fix_ubuntu' into develop

- revert source activation from venv
- need to be activate from user and not the script

script/install/install_locally.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
 EL_USER=${USER}
 EL_HOME=$PWD
 EL_HOME_ODOO="${EL_HOME}/odoo"
@@ -95,7 +94,6 @@ if [[ ! -f ${VENV_REPO_PATH} ]]; then
 fi
 
 # Make .venv active
-source .venv/bin/activate
 
 # Install Multilingual Markdown Generator if missing
 if [[ ! -f ${VENV_MULTILINGUAL_MARKDOWN_PATH} ]]; then

script/install/install_locally_dev.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 ./script/install/install_locally.sh
 retVal=$?
 if [[ $retVal -ne 0 ]]; then

script/install/install_production.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 echo -e "\n---- Create ERPLIBRE system user ----"
 sudo adduser --system --quiet --shell=/bin/bash --home=/${EL_USER} --gecos 'ERPLIBRE' --group ${EL_USER}
 #The user should also be added to the sudo'ers group.

script/install/install_production_nginx.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 TEMP_FILENAME_NGINX_AVAILABLE="localhost"
 NEW_EL_WEBSITE_NAME="${EL_WEBSITE_NAME}"
 if [[ -z "${EL_WEBSITE_NAME}" ]]; then

script/manifest/update_manifest_dev.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"
 

script/manifest/update_manifest_local_dev.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"
 

script/manifest/update_manifest_local_dev_code_generator.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"
 

script/manifest/update_manifest_local_prod.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"
 

script/manifest/update_manifest_prod.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 . ./env_var.sh
-source .venv/bin/activate
+
 #EL_MANIFEST_PROD="./default.xml"
 #EL_MANIFEST_DEV="./manifest/default.dev.xml"