From 061eb95cabe84c648386bb930679d17a6c841b68 Mon Sep 17 00:00:00 2001
From: "Francois B. (Makoto)" <francois@makotonoblog.be>
Date: Sat, 4 Jul 2020 21:02:53 +0200
Subject: [PATCH] minor improvements

---
 core_functions.sh        | 3 +--
 repo_functions_ub1804.sh | 8 ++++----
 repo_functions_ub2004.sh | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index 515d796..6a6089c 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -320,8 +320,7 @@ function installPackageDpkg () {
   printf "\n[PKG] installing $2 from $1\n" &>> $logFile
   cd /tmp \
   && wget -q -O $2 $1 &>> $logFile \
-  && sudo dpkg -i $2 &>> $logFile
-  sudo apt-get install -fy &>> $logFile
+  && sudo apt-get install -fy /tmp/$2 &>> $logFile
   ret_code=$?
   retCode $ret_code
   if [ "$3" == "yes" ]; then
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index 6aeec8e..a981c9f 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -20,10 +20,7 @@
 # List of packages available
 # fields : package name, package manager, category, unique ID for external functions
 #
-Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades
-snapd;apt;snap;snapd
-snap-store;snap;snap;snap-store
-apt-transport-https;apt;init;apt-transport-https
+Apps="apt-transport-https;apt;init;apt-transport-https
 flatpak;apt;init;flatpak
 ubuntu-make;apt;init;ubuntu-make
 gcc-8 g++-8;apt;init;gcc8
@@ -33,6 +30,9 @@ python3-pip;apt;init;python3-pip
 python3-distutils;apt;init;python3-distutils
 pip;pip;init;setuptools
 setuptools;pip;init;setuptools
+unattended-upgrades;apt;unattended-upgrades;unattended-upgrades
+snapd;apt;snap;snapd
+snap-store;snap;snap;snap-store
 cifs-utils;apt;base;cifs-utils
 xterm;apt;base;xterm
 curl;apt;base;curl
diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh
index f7a54c4..019b3c8 100644
--- a/repo_functions_ub2004.sh
+++ b/repo_functions_ub2004.sh
@@ -20,10 +20,7 @@
 # List of packages available
 # fields : package name, package manager, category, unique ID for external functions
 #
-Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades
-snapd;apt;snap;snapd
-snap-store;snap;snap;snap-store
-apt-transport-https;apt;init;apt-transport-https
+Apps="apt-transport-https;apt;init;apt-transport-https
 flatpak;apt;init;flatpak
 ubuntu-make;apt;init;ubuntu-make
 ruby-dev;apt;init;ruby-dev
@@ -32,6 +29,9 @@ python3-pip;apt;init;python3-pip
 python3-distutils;apt;init;python3-distutils
 pip;pip;init;setuptools
 setuptools;pip;init;setuptools
+unattended-upgrades;apt;unattended-upgrades;unattended-upgrades
+snapd;apt;snap;snapd
+snap-store;snap;snap;snap-store
 cifs-utils;apt;base;cifs-utils
 xterm;apt;base;xterm
 curl;apt;base;curl