From 8e2fbd6a98d1355335991e58c9016f29efc02d60 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Fri, 31 Jul 2020 18:44:38 +0200
Subject: [PATCH] revert back to deb pkg for xnviewmp

---
 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, 47 insertions(+), 3 deletions(-)

diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh
index 7f39e81..6a0327d 100644
--- a/install_functions_ub1804.sh
+++ b/install_functions_ub1804.sh
@@ -52,6 +52,24 @@ 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 b14dc62..d2b658b 100644
--- a/install_functions_ub2004.sh
+++ b/install_functions_ub2004.sh
@@ -52,6 +52,24 @@ 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 095e03c..c828e5a 100644
--- a/menus_functions_ub1804.sh
+++ b/menus_functions_ub1804.sh
@@ -307,6 +307,7 @@ 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
@@ -376,6 +377,9 @@ function showAppInstallMenu () {
       "appimagelauncher")
         installAppImageLauncherMenu
         ;;
+      "xnviewmp")
+        installXnViewMPMenu
+        ;;
       "Back")
         break
         ;;
diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh
index 6edf48d..1add451 100644
--- a/menus_functions_ub2004.sh
+++ b/menus_functions_ub2004.sh
@@ -303,6 +303,7 @@ 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
@@ -372,6 +373,9 @@ function showAppInstallMenu () {
       "appimagelauncher")
         installAppImageLauncherMenu
         ;;
+      "xnviewmp")
+        installXnViewMPMenu
+        ;;
       "Back")
         break
         ;;
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index bf77619..195bf64 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -120,7 +120,6 @@ 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 bf97213..8b13758 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -108,7 +108,6 @@ 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 ecf2739..952ea28 100644
--- a/vars.sh
+++ b/vars.sh
@@ -13,7 +13,7 @@
 #
 # app version number
 #
-version="0.6.1-b5"
+version="0.6.1-b6"
 
 #
 # myHomedir is used in full paths to the homedir
diff --git a/yggdrasil.sh b/yggdrasil.sh
index 4848357..db37f1f 100755
--- a/yggdrasil.sh
+++ b/yggdrasil.sh
@@ -106,6 +106,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       installBoostnotes
       installTeamViewer13
       installAppImageLauncher
+      installXnViewMP
       ;;
     f) # full install
       if [ $ygginitCount = false ]; then
@@ -149,6 +150,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do
       installBoostnotes
       installTeamViewer13
       installAppImageLauncher
+      installXnViewMP
       ;;
     c) # install themes and icons
       if [ $ygginitCount = false ]; then