refactor meld (#644)

* refactor meld * rename task * add support for deb based distros * add i Co-authored-by: Adam Perkowski <[email protected]> --------- Co-authored-by: nnyyxxxx <[email protected]> Co-authored-by: Adam Perkowski <[email protected]>
ChrisTitusTech · Sep 30, 2024 · b023f10 · b023f10
1 parent 66b92c8
commit b023f10
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/core/tabs/applications-setup/Developer-tools/meld-setup.sh b/core/tabs/applications-setup/Developer-tools/meld-setup.sh
@@ -3,10 +3,25 @@
 . ../../common-script.sh
 
 installMeld() {
-    cd "$HOME" && git clone https://gitlab.gnome.org/GNOME/meld.git
-    echo "PATH=\$PATH:$HOME/meld/bin" | "$ESCALATION_TOOL" tee -a /etc/environment
+    if ! command_exists meld; then
+        printf "%b\n" "${YELLOW}Installing Meld...${RC}"
+        case "$PACKAGER" in
+            pacman)
+                "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm meld
+                ;;
+            apt-get|nala)
+                "$ESCALATION_TOOL" "$PACKAGER" -y install meld
+                ;;
+            *)
+                . ../setup-flatpak.sh
+                flatpak install -y flathub org.gnome.meld
+                ;;
+        esac
+    else
+        printf "%b\n" "${GREEN}Meld is already installed.${RC}"
+    fi
 }
 
 checkEnv
 checkEscalationTool
-installMeld
+installMeld
diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml
@@ -37,7 +37,7 @@ task_list = "I"
 name = "Meld"
 description = "Meld is a visual diff and merge tool that helps compare files, directories, and version-controlled projects."
 script = "Developer-tools/meld-setup.sh"
-task_list = "I"
+task_list = "I FI"
 
 [[data.entries]]
 name = "Ngrok"