From f51fe02286559e4519050e446551faa7e54e29f5 Mon Sep 17 00:00:00 2001
From: Stephan Raabe <mail@stephan-raabe.de>
Date: Mon, 11 Nov 2024 14:28:02 +0100
Subject: [PATCH] Add more apps to Installation Options script

---
 CHANGELOG.md                      |  2 ++
 lib/options/options.sh            |  7 +++++--
 lib/options/options/browser.sh    |  2 ++
 lib/options/options/other.sh      | 34 +++++++++++++++++++++++++++++++
 share/packages/options/browser.sh |  1 +
 share/packages/options/other.sh   |  6 ++++++
 6 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 lib/options/options/other.sh
 create mode 100644 share/packages/options/other.sh

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5faf33b..d8151c80 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 Version 2.9.6.6
 --------------------------------------------------------
 - Compatible with Hyprland 0.45.0. Replaced legacy variables for drop shadows with new ones in hypr/conf/decorations
+- Zen Browser added to Installation Options browsers
+- Suggested additional default apps added to section others in Installation Options script
 
 Version 2.9.6.5
 --------------------------------------------------------
diff --git a/lib/options/options.sh b/lib/options/options.sh
index 0dd07560..3eb15706 100644
--- a/lib/options/options.sh
+++ b/lib/options/options.sh
@@ -80,9 +80,9 @@ _selectCategory() {
     echo "- System monitor:" $(_checkCurrent system-monitor.sh)     
     echo
     if [[ ! $(_isInstalledAUR "xdg-desktop-portal-gtk") == 0 ]]; then
-        category=$(gum choose "xdg-desktop-portal-gtk" "sddm toggle" "sddm theme" "shell" "terminal" "file manager" "browser" "pywalfox" "system monitor" "REBOOT" "CANCEL")
+        category=$(gum choose "xdg-desktop-portal-gtk" "sddm toggle" "sddm theme" "shell" "terminal" "file manager" "browser" "pywalfox" "system monitor" "other" "REBOOT" "CANCEL")
     else
-        category=$(gum choose "sddm toggle" "sddm theme" "shell" "terminal" "file manager" "browser" "pywalfox" "system monitor" "REBOOT" "CANCEL")
+        category=$(gum choose "sddm toggle" "sddm theme" "shell" "terminal" "file manager" "browser" "pywalfox" "system monitor" "other" "REBOOT" "CANCEL")
     fi
     case ${category} in
         xdg-desktop-portal-gtk)
@@ -100,6 +100,9 @@ _selectCategory() {
         browser)
             source $options_directory/options/browser.sh
         ;;
+        other)
+            source $options_directory/options/other.sh
+        ;;
         shell)
             source $options_directory/options/shell.sh
         ;;
diff --git a/lib/options/options/browser.sh b/lib/options/options/browser.sh
index 29e8115f..9a6cfa0b 100644
--- a/lib/options/options/browser.sh
+++ b/lib/options/options/browser.sh
@@ -21,6 +21,8 @@ else
     fi
     if [ $optionalSelect == "brave-bin" ]; then
         echo 'brave' > "$HOME/.config/ml4w/settings/browser.sh"
+    elif [ $optionalSelect == "zen-browser-bin" ]; then
+        echo 'zen-browser' > "$HOME/.config/ml4w/settings/browser.sh"
     else
         echo "$optionalSelect" > "$HOME/.config/ml4w/settings/browser.sh"
     fi
diff --git a/lib/options/options/other.sh b/lib/options/options/other.sh
new file mode 100644
index 00000000..603eed6b
--- /dev/null
+++ b/lib/options/options/other.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+clear
+echo -e "${GREEN}"
+figlet -f smslant "Other"
+echo -e "${NONE}"
+source $packages_directory/options/other.sh
+toInstall=""
+selectedInstall=""
+
+_checkPackages
+
+optionalSelect=$(gum choose $toInstall "CANCEL")
+if [ -z "$optionalSelect" ] ;then
+    _selectCategory
+elif [ $optionalSelect == "CANCEL" ]; then
+    _selectCategory
+else
+    if [[ ! $(_isInstalledAUR "$optionalSelect") == 0 ]]; then
+        $aur_helper -S $optionalSelect
+    fi
+    if [ $optionalSelect == "pinta" ]; then
+        echo 'pinta' > "$HOME/.config/ml4w/settings/screenshot-editor.sh"
+    fi
+    if [ $optionalSelect == "smile" ]; then
+        echo 'pinta' > "$HOME/.config/ml4w/emojipicker.sh"
+    fi
+    if [ $optionalSelect == "gnome-text-editor" ]; then
+        echo 'gnome-text-editor' > "$HOME/.config/ml4w/editor.sh"
+    fi
+    if [ $optionalSelect == "gnome-calculator" ]; then
+        echo 'gnome-calculator' > "$HOME/.config/ml4w/calculator.sh"
+    fi
+    _selectCategory
+fi
diff --git a/share/packages/options/browser.sh b/share/packages/options/browser.sh
index 6eaede10..20b76601 100644
--- a/share/packages/options/browser.sh
+++ b/share/packages/options/browser.sh
@@ -2,4 +2,5 @@ optdepends=(
     "firefox"
     "chromium"
     "brave-bin"
+    "zen-browser-bin"
 );
\ No newline at end of file
diff --git a/share/packages/options/other.sh b/share/packages/options/other.sh
new file mode 100644
index 00000000..3007ca3b
--- /dev/null
+++ b/share/packages/options/other.sh
@@ -0,0 +1,6 @@
+optdepends=(
+    "pinta"
+    "smile"
+    "gnome-text-editor"
+    "gnome-calculator"
+);
\ No newline at end of file