From 39e198e10cc74f763a4662947bd953d8b4cb21d6 Mon Sep 17 00:00:00 2001
From: Francois B <shakasan@sirenacorp.be>
Date: Mon, 4 Jun 2018 20:50:53 +0200
Subject: [PATCH] ygginit python3-distutils for LM19 only + zeal PPA removed

---
 core_functions.sh        | 28 ++++++++++++++++++++++------
 repo_functions_ub1804.sh |  8 --------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/core_functions.sh b/core_functions.sh
index eef0fea..9764193 100644
--- a/core_functions.sh
+++ b/core_functions.sh
@@ -79,9 +79,9 @@ function pressKey () {
 }
 
 #
-# check if OS is Mint
+# check if OS is Mint 18
 #
-function isMint () {
+function isMint18 () {
   OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'`
   if [[ $OS == *"Linux Mint 18"* ]]; then
     return 0
@@ -90,6 +90,18 @@ function isMint () {
   fi
 }
 
+#
+# check if OS is Mint 19
+#
+function isMint18 () {
+  OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'`
+  if [[ $OS == *"Linux Mint 19"* ]]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 #
 # check if DE is Mate
 #
@@ -168,16 +180,20 @@ function yggInit () {
     printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile
     printf "[INIT]"
     installPackage apt "python3-pip"
-    printf "[INIT]"
-    installPackage apt "python3-distutils"
+    if isMint19; then
+      printf "[INIT]"
+      installPackage apt "python3-distutils"
+    fi
     printf "[INIT]"
     installPackage pip "pip"
     printf "[INIT]"
     installPackage pip "setuptools"
   else
     printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
-    printf "[INIT]"
-    installPackage apt "python3-distutils"
+    if isMint19; then
+      printf "[INIT]"
+      installPackage apt "python3-distutils"
+    fi
     printf "[INIT]"
     installPackage pip "pip"
     printf "[INIT]"
diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh
index f62eded..9fc4943 100644
--- a/repo_functions_ub1804.sh
+++ b/repo_functions_ub1804.sh
@@ -411,7 +411,6 @@ flacon;addRepo_Flacon
 y-ppa-manager;addRepo_YPPAManager
 diodon;addRepo_Diodon
 sayonara;addRepo_Sayonara
-zeal;addRepo_Zeal
 corebird;addRepo_Corebird
 deluge-torrent;addRepo_Deluge
 deluge-gtk;addRepo_Deluge
@@ -649,13 +648,6 @@ function addRepo_Corebird () {
   addPPA ppa:ubuntuhandbook1/corebird
 }
 
-#
-# Zeal
-#
-function addRepo_Zeal () {
-  addPPA ppa:zeal-developers/ppa
-}
-
 #
 # Sayonara
 #