From e5843eed42c7800718e8713049d071668868e699 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Fri, 31 Jul 2020 17:55:04 +0200
Subject: [PATCH] xnviewmp as flatpak instead of external deb pkg

---
 install_functions_ub1804.sh | 18 ------------------
 install_functions_ub2004.sh | 18 ------------------
 menus_functions_ub1804.sh   |  4 ----
 menus_functions_ub2004.sh   |  4 ----
 repo_functions_ub1804.sh    |  1 +
 repo_functions_ub2004.sh    |  1 +
 vars.sh                     |  2 +-
 yggdrasil.sh                |  2 --
 8 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh
index 6a0327d..7f39e81 100644
--- a/install_functions_ub1804.sh
+++ b/install_functions_ub1804.sh
@@ -52,24 +52,6 @@ function installSlackMenu () {
                      yes
 }
 
-#
-# XnViewMP (headless)
-#
-function installXnViewMP () {
-  installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \
-                     xnviewmp.deb \
-                     no
-}
-
-#
-# XnViewMP (Menu)
-#
-function installXnViewMPMenu () {
-  installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \
-                     xnviewmp.deb \
-                     yes
-}
-
 #
 # update AMD/Intel CPU Microcode
 #
diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh
index d2b658b..b14dc62 100644
--- a/install_functions_ub2004.sh
+++ b/install_functions_ub2004.sh
@@ -52,24 +52,6 @@ function installSlackMenu () {
                      yes
 }
 
-#
-# XnViewMP (headless)
-#
-function installXnViewMP () {
-  installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \
-                     xnviewmp.deb \
-                     no
-}
-
-#
-# XnViewMP (Menu)
-#
-function installXnViewMPMenu () {
-  installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \
-                     xnviewmp.deb \
-                     yes
-}
-
 #
 # update AMD/Intel CPU Microcode
 #
diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh
index c828e5a..095e03c 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -307,7 +307,6 @@ function showAppInstallMenu () {
     "viber" "Viber IM desktop app" \
     "slack" "Slack App" \
     "appimagelauncher" "AppImage Launcher" \
-    "xnviewmp" "XNView MP" \
     "Back" "Back"  3>&1 1>&2 2>&3)
 
     case $appsInstallMenuOptions in
@@ -377,9 +376,6 @@ function showAppInstallMenu () {
       "appimagelauncher")
         installAppImageLauncherMenu
         ;;
-      "xnviewmp")
-        installXnViewMPMenu
-        ;;
       "Back")
         break
         ;;
diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 1add451..6edf48d 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -303,7 +303,6 @@ function showAppInstallMenu () {
     "viber" "Viber IM desktop app" \
     "slack" "Slack App" \
     "appimagelauncher" "AppImage Launcher" \
-    "xnviewmp" "XNView MP" \
     "Back" "Back"  3>&1 1>&2 2>&3)
 
     case $appsInstallMenuOptions in
@@ -373,9 +372,6 @@ function showAppInstallMenu () {
       "appimagelauncher")
         installAppImageLauncherMenu
         ;;
-      "xnviewmp")
-        installXnViewMPMenu
-        ;;
       "Back")
         break
         ;;
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 195bf64..bf77619 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -120,6 +120,7 @@ peek;apt;multimedia;peek
 bino;apt;multimedia;bino
 kdenlive;apt;multimedia;kdenlive
 com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor
+com.xnview.XnViewMP;flatpak;multimedia;xnviewmp
 syncthing;apt;internet;syncthing
 syncthing-gtk;apt;internet;syncthinggtk
 insync;apt;internet;insync
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index 8b13758..bf97213 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
+com.xnview.XnViewMP;flatpak;multimedia;xnviewmp
 syncthing;apt;internet;syncthing
 syncthing-gtk;apt;internet;syncthinggtk
 insync;apt;internet;insync
diff --git a/vars.sh b/vars.sh
index d2d3918..ecf2739 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.6.1-b4"
+version="0.6.1-b5"
 
 #
 # myHomedir is used in full paths to the homedir
diff --git a/yggdrasil.sh b/yggdrasil.sh
index a56e6fa..4848357 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -105,7 +105,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       installViber
       installBoostnotes
       installTeamViewer13
-      installXnViewMP
       installAppImageLauncher
       ;;
     f) # full install
@@ -149,7 +148,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       installViber
       installBoostnotes
       installTeamViewer13
-      installXnViewMP
       installAppImageLauncher
       ;;
     c) # install themes and icons