From 388ba73a24938f8f98cab1ac8c35133e6b94ff21 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Mon, 10 Aug 2020 15:24:00 +0200
Subject: [PATCH] LibreOffice Fresh PPA added to both branches

---
 repo_functions_ub1804.sh |  8 ++++----
 repo_functions_ub2004.sh | 10 +++++++++-
 vars.sh                  |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 195bf64..7c37e34 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -380,7 +380,7 @@ flake8;pip;atom;flake8
 autopep8;pip;atom;autopep8
 htmlbeautifier;gem;atom;htmlbeautifier
 nitrogen;apt;nitrogen;nitrogen
-libreoffice;apt;office;libreoffice6
+libreoffice;apt;office;libreoffice
 winehq-stable;apt;wine;winehq-stable
 winetricks;apt;wine;winetricks
 playonlinux;apt;wine;playonlinux
@@ -410,7 +410,7 @@ linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04"
 #
 AppsRepo="kodi-beta;addRepo_KodiBeta
 kodi-nightly;addRepo_KodiNightly
-libreoffice6;addRepo_Libreoffice6
+libreoffice;addRepo_Libreoffice
 mongodb;addRepo_MongoDB_CE
 gyazo;addRepo_Gyazo
 code;addRepo_VSCode
@@ -1045,9 +1045,9 @@ function addRepo_MongoDB_CE () {
 }
 
 #
-# LibreOffice 6
+# LibreOffice
 #
-function addRepo_Libreoffice6 () {
+function addRepo_Libreoffice () {
   addPPA ppa:libreoffice/ppa
 }
 
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 8b13758..6ecc104 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -352,7 +352,7 @@ flake8;pip;atom;flake8
 autopep8;pip;atom;autopep8
 htmlbeautifier;gem;atom;htmlbeautifier
 nitrogen;apt;nitrogen;nitrogen
-libreoffice;apt;office;libreoffice6
+libreoffice;apt;office;libreoffice
 winehq-stable;apt;wine;winehq-stable
 winetricks;apt;wine;winetricks
 playonlinux;apt;wine;playonlinux
@@ -381,6 +381,7 @@ linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"
 # fields : unique ID, function to add repo
 #
 AppsRepo="code;addRepo_VSCode
+libreoffice;addRepo_Libreoffice
 androidstudio;addRepo_AndroidStudio
 sublime-text;addRepo_SublimeText
 vivaldi-stable;addRepo_Vivaldi
@@ -934,6 +935,13 @@ function addRepo_Gyazo () {
 #           "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse"
 # }
 
+#
+# LibreOffice
+#
+function addRepo_Libreoffice () {
+  addPPA ppa:libreoffice/ppa
+}
+
 #
 # Visual Studio Code
 #
diff --git a/vars.sh b/vars.sh
index 952ea28..68af852 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.6.1-b6"
+version="0.6.1-b7"
 
 #
 # myHomedir is used in full paths to the homedir