mathben/erplibre
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge branch 'revert_osx_fix_and_fix_ubuntu' into develop

Browse source 
- revert source activation from venv
- need to be activate from user and not the script
This commit is contained in:
Mathieu Benoit 2023-05-17 01:55:39 -04:00
commit 19182f7f9c
9 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/install/install_locally.sh
View file

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

2
script/install/install_locally_dev.sh
View file

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

2
script/install/install_production.sh
View file

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

2
script/install/install_production_nginx.sh
View file

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

2
script/manifest/update_manifest_dev.sh
View file

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

1
script/manifest/update_manifest_local_dev.sh
View file

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

2
script/manifest/update_manifest_local_dev_code_generator.sh
View file

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

2
script/manifest/update_manifest_local_prod.sh
View file

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

2
script/manifest/update_manifest_prod.sh
View file

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