Merge 4671a8c12e into 79eb752552

core/tabs/applications-setup/communication-apps/whatsapp-setup.sh

@@ -4,20 +4,26 @@
 
 installWhatsapp() {
   printf "%b\n" "${YELLOW}The app we are installing is Zap-Zap, an Open Source Desktop Client for Linux${RC}"
-  if ! command_exists com.rtosta.zapzap && ! command_exists zapzap; then
+  case "$PACKAGER" in
-    printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta)${RC}"
+  pacman)
-    case "$PACKAGER" in
+    if ! command_exists zapzap; then
-      pacman)
+      printf "%b\n" "${YELLOW}Installing Whatsapp(Zap-Zap by rtosta) AUR PACKAGE${RC}"
-        "$AUR_HELPER" -S --needed --noconfirm zapzap
+      "$AUR_HELPER" -S --needed --noconfirm zapzap
-        ;;
+      printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is installed. Search ZapZap to start WhatsApp${RC}"
-      *)
+      return
-        . ../setup-flatpak.sh
+    else
-        flatpak install flathub com.rtosta.zapzap
+      printf "%b\n" "${GREEN}Whatsapp(Zap-Zap by rtosta) is already installed${RC}"
-        ;;
+      return
-    esac
+    fi
-  else
+    ;;
-    printf "%b\n" "${GREEN}WhatsApp(Zap-Zap by rtosta) is already installed.${RC}"
+  *)
-  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