From b8a454fa923ce1bf5757d63f88bb7f79425ced52 Mon Sep 17 00:00:00 2001 From: "harshv5094 (personal PC)" Date: Wed, 16 Oct 2024 10:20:30 +0530 Subject: [PATCH 01/11] feat(communication/whatsapp): add whatsapp desktop client --- .../communication-apps/whatsapp-setup.sh | 30 +++++++++++++++++++ core/tabs/applications-setup/tab_data.toml | 12 ++++++-- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 core/tabs/applications-setup/communication-apps/whatsapp-setup.sh diff --git a/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh b/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh new file mode 100644 index 000000000..3ebed1e05 --- /dev/null +++ b/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh @@ -0,0 +1,30 @@ +#!/bin/sh -e + +. ../../common-script.sh + +installWhatsapp() { + printf "%b\n" "${YELLOW}The app we are installing is Zap-Zap, an Open Source Desktop Client for Linux${RC}" + case "$PACKAGER" in + pacman) + if ! command_exists zapzap; then + printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta) AUR PACKAGE${RC}" + "$AUR_HELPER" -S --needed --noconfirm zapzap + printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is installed. Search ZapZap to start WhatsApp${RC}" + return + else + printf "%b\n" "${GREEN}Whatsapp(Zap-Zap by rtosta) is already installed${RC}" + return + fi + ;; + *) + . ../setup-flatpak.sh + printf "%b\n" "${YELLOW} Installing Whatsapp(Zap-Zap by rtosta) Flatpak ${RC}" + flatpak install flathub com.rtosta.zapzap + printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is installed. Search ZapZap to start WhatsApp${RC}" + return + ;; + esac +} + +checkEnv +installWhatsapp diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index ef6af7dec..5d7e03028 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -78,6 +78,12 @@ description = "Telegram is a cloud-based messaging app known for its speed and s script = "communication-apps/telegram-setup.sh" task_list = "I" +[[data.entries]] +name = "WhatsApp" +description = "WhatsApp is a cloud-based messaging app known for its speed and security, offering features like group chats, channels, and end-to-end encrypted calls." +script = "communication-apps/whatsapp-setup.sh" +task_list = "I" + [[data.entries]] name = "Zoom" description = "Zoom is a widely-used video conferencing platform that allows users to host virtual meetings, webinars, and online collaboration with features like screen sharing and recording." @@ -255,7 +261,7 @@ task_list = "I" [[data.preconditions]] matches = false data = "command_exists" -values = [ "linutil" ] +values = ["linutil"] [[data]] name = "Linutil Updater" @@ -266,7 +272,7 @@ task_list = "I" [[data.preconditions]] matches = true data = "command_exists" -values = [ "linutil" ] +values = ["linutil"] [[data]] name = "Rofi" @@ -282,7 +288,7 @@ task_list = "I SS" [[data.preconditions]] matches = true data = { environment = "XDG_SESSION_TYPE" } -values = [ "wayland", "Wayland" ] +values = ["wayland", "Wayland"] [[data]] name = "ZSH Prompt" From 09aea49b2c031c1b81f3c7fbc6e4f4a60433ec00 Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Sun, 20 Oct 2024 17:57:44 +0530 Subject: [PATCH 02/11] Update core/tabs/applications-setup/communication-apps/whatsapp-setup.sh Co-authored-by: JEEVITHA KANNAN K S --- .../communication-apps/whatsapp-setup.sh | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh b/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh index 3ebed1e05..0ec201ce8 100644 --- a/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh +++ b/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh @@ -4,26 +4,20 @@ installWhatsapp() { printf "%b\n" "${YELLOW}The app we are installing is Zap-Zap, an Open Source Desktop Client for Linux${RC}" - case "$PACKAGER" in - pacman) - if ! command_exists zapzap; then - printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta) AUR PACKAGE${RC}" - "$AUR_HELPER" -S --needed --noconfirm zapzap - printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is installed. Search ZapZap to start WhatsApp${RC}" - return - else - printf "%b\n" "${GREEN}Whatsapp(Zap-Zap by rtosta) is already installed${RC}" - return - fi - ;; - *) - . ../setup-flatpak.sh - printf "%b\n" "${YELLOW} Installing Whatsapp(Zap-Zap by rtosta) Flatpak ${RC}" - flatpak install flathub com.rtosta.zapzap - printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is installed. Search ZapZap to start WhatsApp${RC}" - return - ;; - esac + if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then + printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta)${RC}" + case "$PACKAGER" in + pacman) + "$AUR_HELPER" -S --needed --noconfirm zapzap + ;; + *) + . ../setup-flatpak.sh + flatpak install flathub com.rtosta.zapzap + ;; + esac + else + printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is already installed.${RC}" + fi } checkEnv From da61dc448a45ec34617027aebe154b5139ae0d13 Mon Sep 17 00:00:00 2001 From: "harshv5094 (personal PC)" Date: Fri, 25 Oct 2024 22:02:27 +0530 Subject: [PATCH 03/11] refactor: changing name to zapzap As per @Ilj3954 and @adamperkowski request, I'm changing both option and script name to zapzap (which was the original name of the app) --- .../{whatsapp-setup.sh => zapzap-setup.sh} | 0 core/tabs/applications-setup/tab_data.toml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename core/tabs/applications-setup/communication-apps/{whatsapp-setup.sh => zapzap-setup.sh} (100%) diff --git a/core/tabs/applications-setup/communication-apps/whatsapp-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh similarity index 100% rename from core/tabs/applications-setup/communication-apps/whatsapp-setup.sh rename to core/tabs/applications-setup/communication-apps/zapzap-setup.sh diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index 5d7e03028..fecb1ca57 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -79,9 +79,9 @@ script = "communication-apps/telegram-setup.sh" task_list = "I" [[data.entries]] -name = "WhatsApp" -description = "WhatsApp is a cloud-based messaging app known for its speed and security, offering features like group chats, channels, and end-to-end encrypted calls." -script = "communication-apps/whatsapp-setup.sh" +name = "ZapZap (Whatsapp Client)" +description = "ZapZap is a whatsapp desktop client for linux users, It is an open source project developed by rafatosta." +script = "communication-apps/zapzap-setup.sh" task_list = "I" [[data.entries]] From 81d8f1bfe5dbe8468fffa58a762b1b068630e41b Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Wed, 6 Nov 2024 10:08:13 +0530 Subject: [PATCH 04/11] Update core/tabs/applications-setup/tab_data.toml Co-authored-by: Adam Perkowski --- core/tabs/applications-setup/tab_data.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index fecb1ca57..f2f82c35b 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -80,7 +80,7 @@ task_list = "I" [[data.entries]] name = "ZapZap (Whatsapp Client)" -description = "ZapZap is a whatsapp desktop client for linux users, It is an open source project developed by rafatosta." +description = "ZapZap is an open source whatsapp desktop client for Linux users developed by rafatosta." script = "communication-apps/zapzap-setup.sh" task_list = "I" From 085236f49c99c6031e19e3489aec2dafe75f4b8a Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Wed, 6 Nov 2024 10:08:20 +0530 Subject: [PATCH 05/11] Update core/tabs/applications-setup/communication-apps/zapzap-setup.sh Co-authored-by: Adam Perkowski --- .../tabs/applications-setup/communication-apps/zapzap-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 0ec201ce8..2406033d5 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -2,8 +2,7 @@ . ../../common-script.sh -installWhatsapp() { - printf "%b\n" "${YELLOW}The app we are installing is Zap-Zap, an Open Source Desktop Client for Linux${RC}" +installZapZap() { if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta)${RC}" case "$PACKAGER" in From 9ad963140de4a1e091a30cf5ac6f54fc0c856e13 Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Wed, 6 Nov 2024 10:08:28 +0530 Subject: [PATCH 06/11] Update core/tabs/applications-setup/communication-apps/zapzap-setup.sh Co-authored-by: Adam Perkowski --- core/tabs/applications-setup/communication-apps/zapzap-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 2406033d5..7c5b4bc13 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -4,7 +4,7 @@ installZapZap() { if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then - printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta)${RC}" + printf "%b\n" "${YELLOW}Installing Zap-Zap...${RC}" case "$PACKAGER" in pacman) "$AUR_HELPER" -S --needed --noconfirm zapzap From a13efe57263f001c2399f8201cd8931669d547fe Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Wed, 6 Nov 2024 10:08:35 +0530 Subject: [PATCH 07/11] Update core/tabs/applications-setup/communication-apps/zapzap-setup.sh Co-authored-by: Adam Perkowski --- core/tabs/applications-setup/communication-apps/zapzap-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 7c5b4bc13..3bb1404a7 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -15,7 +15,7 @@ installZapZap() { ;; esac else - printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is already installed.${RC}" + printf "%b\n" "${GREEN}Zap-Zap is already installed.${RC}" fi } From 6924c00817b4ec6eed785d3c6e6aa941285a3684 Mon Sep 17 00:00:00 2001 From: Harsh Vyapari Date: Wed, 6 Nov 2024 10:08:44 +0530 Subject: [PATCH 08/11] Update core/tabs/applications-setup/communication-apps/zapzap-setup.sh Co-authored-by: Adam Perkowski --- core/tabs/applications-setup/communication-apps/zapzap-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 3bb1404a7..533442254 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -20,4 +20,4 @@ installZapZap() { } checkEnv -installWhatsapp +installZapZap From a24739312829cc0bfb9ef5fe2bfa4aa97da1da44 Mon Sep 17 00:00:00 2001 From: "harshv5094 (personal PC)" Date: Wed, 6 Nov 2024 10:17:51 +0530 Subject: [PATCH 09/11] chore: adjusting indentation --- core/tabs/applications-setup/communication-apps/zapzap-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 533442254..833678d12 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -4,7 +4,7 @@ installZapZap() { if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then - printf "%b\n" "${YELLOW}Installing Zap-Zap...${RC}" + printf "%b\n" "${YELLOW}Installing Zap-Zap...${RC}" case "$PACKAGER" in pacman) "$AUR_HELPER" -S --needed --noconfirm zapzap From 8f57123b5411bfad744b642a03c243ea1765d419 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Thu, 7 Nov 2024 13:24:21 -0600 Subject: [PATCH 10/11] Update core/tabs/applications-setup/communication-apps/zapzap-setup.sh Co-authored-by: Jeevitha Kannan K S --- core/tabs/applications-setup/communication-apps/zapzap-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh index 833678d12..4aea85564 100644 --- a/core/tabs/applications-setup/communication-apps/zapzap-setup.sh +++ b/core/tabs/applications-setup/communication-apps/zapzap-setup.sh @@ -10,7 +10,7 @@ installZapZap() { "$AUR_HELPER" -S --needed --noconfirm zapzap ;; *) - . ../setup-flatpak.sh + checkFlatpak flatpak install flathub com.rtosta.zapzap ;; esac From 0637f35194d1d09bac99a7cbf9854c2e13dc3083 Mon Sep 17 00:00:00 2001 From: Chris Titus Date: Thu, 7 Nov 2024 13:24:31 -0600 Subject: [PATCH 11/11] Update core/tabs/applications-setup/tab_data.toml Co-authored-by: Jeevitha Kannan K S --- core/tabs/applications-setup/tab_data.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/tabs/applications-setup/tab_data.toml b/core/tabs/applications-setup/tab_data.toml index b349cadd2..574f8e7b7 100644 --- a/core/tabs/applications-setup/tab_data.toml +++ b/core/tabs/applications-setup/tab_data.toml @@ -85,8 +85,7 @@ script = "Developer-tools/sublime-setup.sh" task_list = "I" [[data.entries]] -name = " -(Whatsapp Client)" +name = "ZapZap" description = "ZapZap is an open source whatsapp desktop client for Linux users developed by rafatosta." script = "communication-apps/zapzap-setup.sh" task_list = "I"