From 8abb52b85a711ac618f60bbc5226ab00120e833d Mon Sep 17 00:00:00 2001
From: PierreGode <pierre@gode.one>
Date: Wed, 13 Nov 2019 09:22:34 +0100
Subject: [PATCH] Added support for ubuntu 19 -19.10

---
 ADconnection.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ADconnection.sh b/ADconnection.sh
index 1888d54..9178643 100755
--- a/ADconnection.sh
+++ b/ADconnection.sh
@@ -623,6 +623,10 @@ read -r ADMIN
    clear
 if [ "$var" -eq "19" ]
 then
+if [ -f /etc/apt/sources.list.d/aroth-ubuntu-ppa-eoan.list ]
+sudo apt-get update
+sudo apt-get --only-upgrade install adcli
+else
 echo""
 echo "Fixing krb5.keytab: Bad encryption type for ubuntu 19.10"
 echo ""
@@ -632,8 +636,7 @@ sudo add-apt-repository ppa:aroth/ppa
 sudo apt-get update
 sudo apt-get --only-upgrade install adcli
 echo ""
-echo "If the script fails please run sudo apt-get upgrade to update adcli and run the script again"
-echo ""
+fi
 fi
 sudo echo "${INTRO_TEXT}Realm=$DOMAIN${END}"
 echo "${INTRO_TEXT}Joining Ubuntu $var${END}"
@@ -1832,6 +1835,11 @@ read -r ADMIN
    clear
 if [ "$var" -eq "19" ]
 then
+if [ -f /etc/apt/sources.list.d/aroth-ubuntu-ppa-eoan.list ]
+sudo apt-get update
+sudo apt-get --only-upgrade install adcli
+else
+echo""
 echo "Fixing krb5.keytab: Bad encryption type for ubuntu 19.10"
 echo ""
 echo "To avoid encryption error with adcli please accept PPA below for an adcli update"
@@ -1839,6 +1847,8 @@ echo ""
 sudo add-apt-repository ppa:aroth/ppa
 sudo apt-get update
 sudo apt-get --only-upgrade install adcli
+echo ""
+fi
 fi
 sudo echo "${INTRO_TEXT}Realm=$DOMAIN${END}"
 echo "${INTRO_TEXT}Joining Ubuntu $var${END}"