francois/yggdrasil_ng
francois/yggdrasil_ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ygginit python3-distutils for LM19 only + zeal PPA removed

Browse source
This commit is contained in:
Francois B 2018-06-04 20:50:53 +02:00
parent a6612ea590
commit 39e198e10c
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core_functions.sh
View file

@ -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}'` OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'`
if [[ $OS == *"Linux Mint 18"* ]]; then if [[ $OS == *"Linux Mint 18"* ]]; then
return 0 return 0
@ -90,6 +90,18 @@ function isMint () {
fi 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 # check if DE is Mate
# #
@ -168,16 +180,20 @@ function yggInit () {
printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile
printf "[INIT]" printf "[INIT]"
installPackage apt "python3-pip" installPackage apt "python3-pip"
if isMint19; then
printf "[INIT]" printf "[INIT]"
installPackage apt "python3-distutils" installPackage apt "python3-distutils"
fi
printf "[INIT]" printf "[INIT]"
installPackage pip "pip" installPackage pip "pip"
printf "[INIT]" printf "[INIT]"
installPackage pip "setuptools" installPackage pip "setuptools"
else else
printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
if isMint19; then
printf "[INIT]" printf "[INIT]"
installPackage apt "python3-distutils" installPackage apt "python3-distutils"
fi
printf "[INIT]" printf "[INIT]"
installPackage pip "pip" installPackage pip "pip"
printf "[INIT]" printf "[INIT]"

8
repo_functions_ub1804.sh
View file

@ -411,7 +411,6 @@ flacon;addRepo_Flacon
y-ppa-manager;addRepo_YPPAManager y-ppa-manager;addRepo_YPPAManager
diodon;addRepo_Diodon diodon;addRepo_Diodon
sayonara;addRepo_Sayonara sayonara;addRepo_Sayonara
zeal;addRepo_Zeal
corebird;addRepo_Corebird corebird;addRepo_Corebird
deluge-torrent;addRepo_Deluge deluge-torrent;addRepo_Deluge
deluge-gtk;addRepo_Deluge deluge-gtk;addRepo_Deluge
@ -649,13 +648,6 @@ function addRepo_Corebird () {
addPPA ppa:ubuntuhandbook1/corebird addPPA ppa:ubuntuhandbook1/corebird
} }
#
# Zeal
#
function addRepo_Zeal () {
addPPA ppa:zeal-developers/ppa
}
# #
# Sayonara # Sayonara
# #