[FIX] install OSX: limit hard run.sh and source activate
Signed-off-by: Alexandre Ferreira Benevides <alexandre.ferreira.benevides@gmail.com>
This commit is contained in:
parent
18d6581b1e
commit
ee401b22a7
4 changed files with 9 additions and 6 deletions
2
run.sh
2
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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ----"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue