From 702f4191198bedb7d7d0f3017fe0f663aa6c0afc Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Sun, 27 Jun 2021 01:24:31 -0400 Subject: [PATCH] [UPD] code_generator need --dev to be installed for secure in prod --- Makefile | 36 +++++++++---------- doc/CODE_GENERATOR.base.md | 20 +++++------ script/addons/install_addons_dev.sh | 7 ++++ script/addons/reinstall_addons.sh | 2 +- .../install_and_test_code_generator.sh | 4 +-- 5 files changed, 38 insertions(+), 31 deletions(-) create mode 100755 script/addons/install_addons_dev.sh diff --git a/Makefile b/Makefile index 9d91ea4..58ce9f4 100644 --- a/Makefile +++ b/Makefile @@ -144,19 +144,19 @@ db_restore_erplibre_base_db_template: ######################### .PHONY: addons_install_code_generator_basic addons_install_code_generator_basic: db_restore_erplibre_base_db_code_generator - ./script/addons/install_addons.sh code_generator code_generator + ./script/addons/install_addons_dev.sh code_generator code_generator .PHONY: addons_install_code_generator_featured addons_install_code_generator_featured: addons_install_code_generator_basic - ./script/addons/install_addons.sh code_generator code_generator_cron,code_generator_hook,code_generator_portal + ./script/addons/install_addons_dev.sh code_generator code_generator_cron,code_generator_hook,code_generator_portal .PHONY: addons_install_code_generator_full addons_install_code_generator_full: addons_install_code_generator_featured - ./script/addons/install_addons.sh code_generator code_generator_db_servers,code_generator_website_snippet,code_generator_geoengine,code_generator_theme_website,code_generator_website_leaflet + ./script/addons/install_addons_dev.sh code_generator code_generator_db_servers,code_generator_website_snippet,code_generator_geoengine,code_generator_theme_website,code_generator_website_leaflet .PHONY: addons_install_code_generator_demo addons_install_code_generator_demo: - ./script/addons/install_addons.sh code_generator code_generator_demo + ./script/addons/install_addons_dev.sh code_generator code_generator_demo .PHONY: addons_uninstall_code_generator_demo addons_uninstall_code_generator_demo: @@ -167,28 +167,28 @@ addons_reinstall_code_generator_demo: addons_uninstall_code_generator_demo addon .PHONY: addons_install_all_code_generator_demo addons_install_all_code_generator_demo: db_restore_erplibre_base_db_code_generator - ./script/addons/install_addons.sh code_generator code_generator_demo - ./script/addons/install_addons.sh code_generator code_generator_demo_export_helpdesk - ./script/addons/install_addons.sh code_generator code_generator_demo_internal - ./script/addons/install_addons.sh code_generator code_generator_demo_portal - ./script/addons/install_addons.sh code_generator code_generator_demo_theme_website - ./script/addons/install_addons.sh code_generator code_generator_demo_website_leaflet - ./script/addons/install_addons.sh code_generator code_generator_demo_website_snippet + ./script/addons/install_addons_dev.sh code_generator code_generator_demo + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_export_helpdesk + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_internal + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_portal + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_theme_website + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_leaflet + ./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_snippet .PHONY: addons_install_all_code_generator_template addons_install_all_code_generator_template: - ./script/addons/install_addons.sh template demo_portal,auto_backup - ./script/addons/install_addons.sh template code_generator_template_demo_portal code_generator_template_demo_sysadmin_cron + ./script/addons/install_addons_dev.sh template demo_portal,auto_backup + ./script/addons/install_addons_dev.sh template code_generator_template_demo_portal code_generator_template_demo_sysadmin_cron .PHONY: addons_install_all_generated_demo addons_install_all_generated_demo: - ./script/addons/install_addons.sh template demo_export_helpdesk,demo_internal,demo_portal,demo_website_leaflet,demo_website_snippet + ./script/addons/install_addons_dev.sh template demo_export_helpdesk,demo_internal,demo_portal,demo_website_leaflet,demo_website_snippet # TODO support installation theme with cli - #./script/addons/install_addons.sh template theme_website_demo_code_generator + #./script/addons/install_addons_dev.sh template theme_website_demo_code_generator .PHONY: addons_install_all_code_generator addons_install_all_code_generator: - ./script/addons/install_addons.sh code_generator code_generator_auto_backup + ./script/addons/install_addons_dev.sh code_generator code_generator_auto_backup ########## # test # @@ -223,14 +223,14 @@ test_code_generator_generation_extra: test_code_generator_code_i18n: ./script/code_generator/check_git_change_code_generator.sh ./addons/TechnoLibre_odoo-code-generator-template time ./script/db_restore.py --database template - ./script/addons/install_addons.sh template demo_portal + ./script/addons/install_addons_dev.sh template demo_portal ./script/code_generator/install_and_test_code_generator.sh template code_generator_template_demo_portal ./addons/TechnoLibre_odoo-code-generator-template .PHONY: test_code_generator_code_i18n_extra test_code_generator_code_i18n_extra: ./script/code_generator/check_git_change_code_generator.sh ./addons/OCA_server-tools/auto_backup time ./script/db_restore.py --database template - ./script/addons/install_addons.sh template auto_backup + ./script/addons/install_addons_dev.sh template auto_backup ./script/code_generator/install_and_test_code_generator.sh template code_generator_template_demo_sysadmin_cron ./addons/TechnoLibre_odoo-code-generator-template # To support i18n in auto_backup ./script/code_generator/check_git_change_code_generator.sh ./addons/OCA_server-tools/auto_backup diff --git a/doc/CODE_GENERATOR.base.md b/doc/CODE_GENERATOR.base.md index 667d800..6d10a83 100644 --- a/doc/CODE_GENERATOR.base.md +++ b/doc/CODE_GENERATOR.base.md @@ -218,7 +218,7 @@ Pour continuer avec l'exemple, généré le template `code_generator_template_de ```bash make db_restore_erplibre_base_db_template -./script/addons/install_addons.sh template code_generator_template_demo_website_snippet +./script/addons/install_addons_dev.sh template code_generator_template_demo_website_snippet ``` @@ -259,7 +259,7 @@ Pour continuer avec l'exemple, généré le template `code_generator_template_de ```bash -./script/addons/install_addons.sh code_generator code_generator_template_demo_website_snippet +./script/addons/install_addons_dev.sh code_generator code_generator_template_demo_website_snippet ``` @@ -293,7 +293,7 @@ Générer votre module : ```bash -./script/addons/install_addons.sh code_generator code_generator_demo_website_snippet +./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_snippet ``` @@ -311,7 +311,7 @@ Il est maintenant possible de modifier les paramètres via l'interface manuelle ```bash make db_restore_erplibre_base_db_code_generator -./script/addons/install_addons.sh code_generator code_generator_demo_website_snippet +./script/addons/install_addons_dev.sh code_generator code_generator_demo_website_snippet ``` @@ -332,7 +332,7 @@ value["enable_sync_template"] = True Exécuter l'installation du template pour qu'il se synchronise sur le module généré. ```bash make db_restore_erplibre_base_db_template -./script/addons/install_addons.sh template code_generator_template_demo_website_snippet +./script/addons/install_addons_dev.sh template code_generator_template_demo_website_snippet ``` @@ -345,7 +345,7 @@ Prêt à tester, générer le module : ```bash # Optional, reset test database make db_restore_erplibre_base_db_test -./script/addons/install_addons.sh test demo_website_snippet +./script/addons/install_addons_dev.sh test demo_website_snippet ``` @@ -375,8 +375,8 @@ Premièrement, installer le module, par exemple `demo_portal`, et ensuite le tem ```bash make db_restore_erplibre_base_db_code_generator -./script/addons/install_addons.sh test demo_portal -./script/addons/install_addons.sh test code_generator_template_demo_portal +./script/addons/install_addons_dev.sh test demo_portal +./script/addons/install_addons_dev.sh test code_generator_template_demo_portal ``` @@ -403,8 +403,8 @@ Exemple : ```bash make db_restore_erplibre_base_db_code_generator -./script/addons/install_addons.sh test demo_portal -./script/addons/install_addons.sh test code_generator_template_demo_portal +./script/addons/install_addons_dev.sh test demo_portal +./script/addons/install_addons_dev.sh test code_generator_template_demo_portal ``` diff --git a/script/addons/install_addons_dev.sh b/script/addons/install_addons_dev.sh new file mode 100755 index 0000000..ba82bb8 --- /dev/null +++ b/script/addons/install_addons_dev.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +./run.sh --no-http --stop-after-init --dev qweb -d $1 -i $2 -u $2 +retVal=$? +if [[ $retVal -ne 0 ]]; then + echo "Error install_addons_dev.sh" + exit 1 +fi diff --git a/script/addons/reinstall_addons.sh b/script/addons/reinstall_addons.sh index 4035d72..a32fb6e 100755 --- a/script/addons/reinstall_addons.sh +++ b/script/addons/reinstall_addons.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash ./script/addons/uninstall_addons.sh $1 $2 -./script/addons/install_addons.sh $1 $2 +./script/addons/install_addons_dev.sh $1 $2 retVal=$? if [[ $retVal -ne 0 ]]; then echo "Error reinstall_addons.sh" diff --git a/script/code_generator/install_and_test_code_generator.sh b/script/code_generator/install_and_test_code_generator.sh index 9290906..58f66bb 100755 --- a/script/code_generator/install_and_test_code_generator.sh +++ b/script/code_generator/install_and_test_code_generator.sh @@ -3,10 +3,10 @@ # $2 is module name # $3 is directory path to check -./script/addons/install_addons.sh $1 $2 +./script/addons/install_addons_dev.sh $1 $2 retVal=$? if [[ $retVal -ne 0 ]]; then - echo "Error ./script/addons/install_addons.sh ${1} ${2}" + echo "Error ./script/addons/install_addons_dev.sh ${1} ${2}" exit 1 fi ./script/repo_revert_git_diff_date_from_code_generator.py