From 875fe42adaeb715cd2c184eda622177aa6496e77 Mon Sep 17 00:00:00 2001 From: shakasan Date: Tue, 20 Mar 2018 03:44:55 +0100 Subject: [PATCH] umake ppa and app check at init --- core_functions.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 80f1d0f..d189ae8 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -108,8 +108,11 @@ function yggInit () { typeset ret_code if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ubuntu-make; then - printf "[INIT]" + printf "[INIT][UMAKE] PPA not found, adding PPA...\n" + printf "[INIT][UMAKE] PPA not found, adding PPA...\n" &>> $logFile addPPA "ppa:ubuntu-desktop/ubuntu-make" + else + printf "[INIT][UMAKE] PPA found [ ""$BOLDVERT""OK"$NORMAL" ] \n" fi printf "[APT] update " @@ -118,6 +121,17 @@ function yggInit () { ret_code=$? retCode $ret_code + printf "[INIT]" + installPackage apt "apt-transport-https" + + if ! which umake >/dev/null; then + printf "[INIT][UMAKE] not found, installing...\n" + printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile + installPackage apt "ubuntu-make" + else + printf "[INIT][UMAKE] found [ ""$BOLDVERT""OK"$NORMAL" ] \n" + fi + if ! which gem >/dev/null; then printf "[INIT][GEM] not found, installing...\n" printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile @@ -142,9 +156,6 @@ function yggInit () { printf "[INIT][NPM] found [ ""$BOLDVERT""OK"$NORMAL" ] \n" fi - printf "[INIT]" - installPackage apt "apt-transport-https" - if ! which pip3 >/dev/null; then printf "[INIT][PIP] not found, installing...\n" printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile