From 2667a7c64f835296e21796e2a4c19d7b3db8a56d Mon Sep 17 00:00:00 2001
From: az <ansgar.zwick@meissa-gmbh.de>
Date: Sun, 2 Apr 2023 09:59:51 +0200
Subject: [PATCH] [skip ci] add meld to office desktop

---
 .../provs/desktop/domain/DesktopService.kt                    | 4 ++--
 .../provs/desktop/infrastructure/PackageBundles.kt            | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
index ef7aded..9a03b87 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/domain/DesktopService.kt
@@ -106,19 +106,19 @@ fun Prov.provisionMSDesktop(onlyModules: List<String>?) {
 fun Prov.provisionOfficeDesktop(onlyModules: List<String>? = null) {
     if (onlyModules == null) {
         aptInstall(ZIP_UTILS)
+        aptInstall(SPELLCHECKING_DE)
         aptInstall(BROWSER)
         aptInstall(EMAIL_CLIENT)
         installDeltaChat()
         aptInstall(OFFICE_SUITE)
         installZimWiki()
         installNextcloudClient()
+        aptInstall(COMPARE_TOOLS)
 
         // optional as installation of these tools often fail and they are not considered mandatory
         optional {
             aptInstall(DRAWING_TOOLS)
         }
-
-        aptInstall(SPELLCHECKING_DE)
     } else if (onlyModules.contains(DesktopOnlyModule.VERIFY.name.lowercase())) {
         verifyOfficeSetup()
     } else if (onlyModules.contains(DesktopOnlyModule.FIREFOX.name.lowercase())) {
diff --git a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
index ae890f9..f3c7faa 100644
--- a/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
+++ b/src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/PackageBundles.kt
@@ -38,4 +38,6 @@ val CLOJURE_TOOLS = "leiningen"
 
 val PASSWORD_TOOLS = "pwgen"
 
-val SCREEN_TOOLS = "scrcpy"
\ No newline at end of file
+val SCREEN_TOOLS = "scrcpy"
+
+val COMPARE_TOOLS = "meld"
\ No newline at end of file