diff --git a/Makefile b/Makefile index bd678b3..c4a3574 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,9 @@ help: ## This help. # thanks to https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html .DEFAULT_GOAL := help +.remove_node_modules: ## Remove node_modules + rm -rf node_modules + build_mdi_svg: ## Build custom mdi svg cd custom-npms/nc-mdi-svg && \ FONTAWESOME_PACKAGE_TOKEN=$(FONTAWESOME_PACKAGE_TOKEN) npm ci && \ @@ -124,5 +127,5 @@ zip_dependencies: ## Zip relevant files build_release: build_nextcloud .build_deps add_config_partials zip_dependencies ## Build a release package (build apps/themes, copy configs and package) echo "Everything done for a release" -build_locally: build_nextcloud .build_deps ## Build all apps/themes for local development +build_locally: .remove_node_modules build_nextcloud .build_deps ## Build all apps/themes for local development echo "Everything done for local/dev" diff --git a/configure.sh b/configure.sh index 1fd8a6f..9c28153 100755 --- a/configure.sh +++ b/configure.sh @@ -37,6 +37,19 @@ config_ui() { ooc config:system:set defaultapp --value files } +configure_app_nc_ionos_processes() { + echo "Configure nc_ionos_processes app" + + if [ -z "${IONOS_PROCESSES_API_URL}" ] || [ -z "${IONOS_PROCESSES_USER}" ] || [ -z "${IONOS_PROCESSES_PASS}" ]; then + echo "\033[1;33mWarning: IONOS_PROCESSES_API_URL, IONOS_PROCESSES_USER or IONOS_PROCESSES_PASS not set, skipping configuration of nc_ionos_processes app\033[0m" + return + fi + + ooc config:app:set --value "${IONOS_PROCESSES_API_URL}" --type string nc_ionos_processes ionos_mail_base_url + ooc config:app:set --value "${IONOS_PROCESSES_USER}" --type string nc_ionos_processes basic_auth_user + ooc config:app:set --value "${IONOS_PROCESSES_PASS}" --type string nc_ionos_processes basic_auth_pass +} + config_apps() { echo "Configure apps ..." @@ -60,17 +73,8 @@ config_apps() { ooc config:app:set --value="no" core shareapi_only_share_with_group_members ooc config:app:set --value='["admin"]' core shareapi_only_share_with_group_members_exclude_group_list - echo "Configure nc_ionos_processes app" + configure_app_nc_ionos_processes - if [ -z "${IONOS_PROCESSES_API_URL}" ] || [ -z "${IONOS_PROCESSES_USER}" ] || [ -z "${IONOS_PROCESSES_PASS}" ]; then - echo "Warning: IONOS_PROCESSES_API_URL, IONOS_PROCESSES_USER or IONOS_PROCESSES_PASS not set, skipping configuration of nc_ionos_processes app" - return - fi - - ooc config:app:set --value "${IONOS_PROCESSES_API_URL}" --type string nc_ionos_processes ionos_mail_base_url - ooc config:app:set --value "${IONOS_PROCESSES_USER}" --type string nc_ionos_processes basic_auth_user - ooc config:app:set --value "${IONOS_PROCESSES_PASS}" --type string nc_ionos_processes basic_auth_pass - echo "Configure files app" ooc config:app:set --value yes files crop_image_previews ooc config:app:set --value yes files show_hidden