From 2ba1d57714a4a29658391d9ccebacb83489ff6bf Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Sat, 31 Oct 2020 23:03:09 +0100
Subject: [PATCH] MongoDB CE 4 + vainfo added (20.04 branch)

---
 menus_functions_ub2004.sh |  4 ++++
 repo_functions_ub2004.sh  | 20 +++++++++++---------
 vars.sh                   |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 1add451..acb6e78 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -175,6 +175,7 @@ function showDevInstallMenu () {
     "devbase" "dev apps and tools" \
     "java11" "OpenJDK Java 11 dev env" \
     "javascript" "JavaScript dev env" \
+    "mongodb" "MongoDB CE 4" \
     "php" "PHP dev env" \
     "lua" "Lua dev env" \
     "ruby" "Ruby dev env" \
@@ -206,6 +207,9 @@ function showDevInstallMenu () {
       "javascript")
         installAppsFromListMenu javascript
         ;;
+      "mongodb")
+        installAppsFromListMenu mongodb
+        ;;
       "php")
         installAppsFromListMenu php
         ;;
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index cbeff68..11c1b97 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -108,6 +108,7 @@ flacon;apt;multimedia;flacon
 simplescreenrecorder;apt;multimedia;simplescreenrecorder
 com.ozmartians.VidCutter;flatpak;multimedia;vidcutter
 com.orama_interactive.Pixelorama;flatpak;multimedia;pixelorama
+vainfo;apt;multimedia;vainfo
 syncthing;apt;internet;syncthing
 syncthing-gtk;apt;internet;syncthinggtk
 insync;apt;internet;insync
@@ -328,6 +329,7 @@ ionic;npm;javascript;ionic
 cordova;npm;javascript;cordova
 eslint;npm;javascript;eslint
 web-ext;npm;javascript;web-ext
+mongodb-org;apt;mongodb;mongodb
 openjdk-11-jdk;apt;java11;openjdk-11-jdk
 php7.4-cli;apt;php;php7.4-cli
 php-pear;apt;php;php-pear
@@ -372,7 +374,7 @@ linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"
 #TODO : no focal support yet
 #aptik;apt;utilities;aptik
 #green-recorder;apt;multimedia;green-recorder
-#mongodb-org;apt;mongodb;mongodb
+
 
 #-----------------------------------------------------------------------------#
 # Specific Repo list and functions                                            #
@@ -464,7 +466,8 @@ avidemux;addRepo_Avidemux
 winehq-stable;addRepo_WineHQ
 audacity;addRepo_Audacity
 ubuntu-make;addRepo_UbuntuMake
-chromium-browser;addRepo_ChromiumBrowser"
+chromium-browser;addRepo_ChromiumBrowser
+mongodb;addRepo_MongoDB_CE"
 
 #TODO : no focal support yet / or not needed yet
 #rawtherapee;addRepo_DhorMyWay
@@ -482,7 +485,6 @@ chromium-browser;addRepo_ChromiumBrowser"
 #syncthinggtk;addRepo_SyncthingGtk
 #wireshark;addRepo_WireShark
 #green-recorder;addRepo_GreenRecorder
-#mongodb;addRepo_MongoDB_CE
 #flatpak;addRepo_flatpak
 
 #
@@ -937,13 +939,13 @@ function addRepo_Gyazo () {
 }
 
 #
-# MongoDB 4 CE #TODO : no focal support yet
+# MongoDB 4 CE
 #
-# function addRepo_MongoDB_CE () {
-#   addKey "https://www.mongodb.org/static/pgp/server-4.2.asc"
-#   addRepo "mongodb-org-4.2.list" \
-#           "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse"
-# }
+function addRepo_MongoDB_CE () {
+  addKey "https://www.mongodb.org/static/pgp/server-4.4.asc"
+  addRepo "mongodb-org-4.4.list" \
+          "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse"
+}
 
 #
 # LibreOffice
diff --git a/vars.sh b/vars.sh
index 40a76a7..b95097d 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.6.1-b19"
+version="0.6.1-b21"
 
 #
 # myHomedir is used in full paths to the homedir