From 7e65bec3754d8a39e9db811b492dd79482c2eac2 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Wed, 9 Dec 2020 11:33:42 +0100
Subject: [PATCH] new pkgmanager var also added to installer

---
 installer.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/installer.sh b/installer.sh
index daf2dce..581272b 100644
--- a/installer.sh
+++ b/installer.sh
@@ -38,21 +38,29 @@ dist=$(grep --color=never -Po "^ID=\K.*" "/etc/os-release")
 
 if [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"18.04"* ]]; then
  PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=ubu1804
 elif [[ "${dist}" == *"ubuntu"* ]] && [[ "${dist_ver}" == *"20.04"* ]]; then
  PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=ubu2004 
 elif [[ "${dist}" == *"debian"* ]] && [[ "${dist_ver}" == *"10"* ]]; then
  PKGM="$APTMODE"
+ PKGUC="$PKGM update"
+ PKGUP="$PKGM upgrade -y"
  PKGI="${PKGM} install -y --no-install-recommends"
  PKGLIST="apt"
  shortdist=deb10
 elif [[ "${dist}" == *"centos"* ]] && [[ "${dist_ver}" == *"8"* ]]; then
  PKGM="dnf"
+ PKGUC="$PKGM check-update --refresh"
+ PKGUP="$PKGM update -y"
  PKGI="${PKGM} install --setopt=install_weak_deps=False --best -y"
  PKGLIST="dnf"
  shortdist=cent8
@@ -204,7 +212,7 @@ if [[ "$syscheckoff" -ne 1 ]] && [[ -d /etc/ICTM ]]; then msg "             This
 ##--------------------------##
 
 msg "              Starting installer" 8 78
-$PKGM update -y > $OUTPUT 2>&1
+$PKGUC > $OUTPUT 2>&1
 $PKGI curl wget > $OUTPUT 2>&1
 
 
@@ -361,7 +369,7 @@ fi
 mkdir -p /etc/ICTM/sites
 echo "InstDate=$(date "+%d-%B-%Y")" >> /etc/ICTM/mainvar.list
 
-for storeme in PKGM PKGI PKGLIST OUTPUT IMODE shortdist repo branch branchtype webserv email shortdist hostname; do
+for storeme in PKGM PKGI PKGUC PKGUP PKGLIST OUTPUT IMODE shortdist repo branch branchtype webserv email shortdist hostname; do
     declare -p $storeme | cut -d ' ' -f 3- >> /etc/ICTM/mainvar.list
 done