diff --git a/script/install/install_locally_dev.sh b/script/install/install_locally_dev.sh index d7ee21f..bfe9f12 100755 --- a/script/install/install_locally_dev.sh +++ b/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 diff --git a/script/install/install_production.sh b/script/install/install_production.sh index 77199f8..5895003 100755 --- a/script/install/install_production.sh +++ b/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. diff --git a/script/install/install_production_nginx.sh b/script/install/install_production_nginx.sh index 0b5ab5e..f38bcc8 100755 --- a/script/install/install_production_nginx.sh +++ b/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 diff --git a/script/manifest/update_manifest_dev.sh b/script/manifest/update_manifest_dev.sh index 5fc78da..e1804b6 100755 --- a/script/manifest/update_manifest_dev.sh +++ b/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" diff --git a/script/manifest/update_manifest_local_dev_code_generator.sh b/script/manifest/update_manifest_local_dev_code_generator.sh index aaf0c74..907d45f 100755 --- a/script/manifest/update_manifest_local_dev_code_generator.sh +++ b/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" diff --git a/script/manifest/update_manifest_local_prod.sh b/script/manifest/update_manifest_local_prod.sh index 9bda8cc..501ef68 100755 --- a/script/manifest/update_manifest_local_prod.sh +++ b/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" diff --git a/script/manifest/update_manifest_prod.sh b/script/manifest/update_manifest_prod.sh index d2f33c6..f79b6ec 100755 --- a/script/manifest/update_manifest_prod.sh +++ b/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"