From c0c5ee79fcdf683b29af0a40a102ea94c384a1f5 Mon Sep 17 00:00:00 2001 From: Evilham Date: Thu, 24 Nov 2022 16:38:03 +0100 Subject: [PATCH] [dd-ctl] Unify for loops for apps that have to be disabled --- dd-ctl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dd-ctl b/dd-ctl index 9b4bc59..e6ddb27 100755 --- a/dd-ctl +++ b/dd-ctl @@ -328,9 +328,9 @@ setup_nextcloud(){ docker exec -u www-data dd-apps-nextcloud-app php occ --no-warnings config:system:set skeletondirectory --value='' # Disable certain NextCloud apps - for app in firstrunwizard recommendations dashboard; do + for app in firstrunwizard recommendations dashboard circles; do docker exec -i -u www-data dd-apps-nextcloud-app sh -s <<-EOF - php occ --no-warnings app:disable "${app}" + php occ --no-warnings app:disable "${app}" || true EOF done @@ -356,14 +356,6 @@ setup_nextcloud(){ EOF fi - # Disable in Nextcloud - # shellcheck disable=SC2043 # We currently only force-disable one app - for app in circles; do - docker exec -i -u www-data dd-apps-nextcloud-app sh -s <<-EOF - php occ --no-warnings app:disable "${app}" || true - EOF - done - # Temporary patch while upstream lands our changes # See: https://github.com/nextcloud/mail/pull/6908 for f in appinfo/info.xml lib/Command/UpdateAccount.php lib/Db/MailAccountMapper.php; do