Merge branch 'OSX_install_fev2023'

- support OSX update

run.sh

@@ -11,7 +11,7 @@ if [ ! -f "${CONFIG_PATH}" ]; then
   fi
 fi
 
-python3 ./odoo/odoo-bin -c ${CONFIG_PATH} --limit-time-real 99999 --limit-time-cpu 99999 $@
+python3 ./odoo/odoo-bin -c ${CONFIG_PATH} --limit-time-real 99999 --limit-time-cpu 99999 --limit-memory-hard=0 "$@"
 retVal=$?
 if [[ $retVal -ne 0 ]]; then
   echo "Error run.sh"

script/install/install_OSX_dependency.sh

@@ -13,9 +13,9 @@ EL_USER=${USER}
 # Install PostgreSQL Server
 #--------------------------------------------------
 echo  "\n---- Install PostgreSQL Server ----"
-brew install postgresql
+brew install postgresql@15
 brew install postgis
-brew services start postgresql
+brew services start postgresql@15
 
 echo  "\n---- Creating the ERPLibre PostgreSQL User  ----"
 sudo su - postgres -c "createuser -s ${EL_USER}" 2> /dev/null || true
@@ -25,7 +25,7 @@ sudo su - postgres -c "CREATE EXTENSION postgis;\nCREATE EXTENSION postgis_topol
 # Install Dependencies
 #--------------------------------------------------
 echo  "\n--- Installing Python 3 + pip3 --"
-brew install git python3 wget
+brew install git python@3.7 wget parallel mariadb
 brew link git
 brew link wget
 

script/install/install_locally.sh

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

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,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_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"