From bc8a46fd5d8b62e237c4544b5c041fbe0303ac84 Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 09:09:12 +0200 Subject: [PATCH] . --- core_functions.sh | 7 +++---- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + yggdrasil.sh | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 82034d0..70a79d6 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -411,8 +411,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD] package -- $1 -- repo/ppa " - printf "added by function -- ${appRepo[1]}\n" + printf "[ADD_REPP_PPA][$1][${appRepo[1]}]" eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi @@ -433,7 +432,7 @@ function processAppTrtFct () { for i in $AppsPostTrtFct; do appPostTrtFct=(${i//;/ }) if [ "${appPostTrtFct[0]}" == "$1" ]; then - printf "[TRT][POST][$1][${appPostTrtFct[1]}]\n" + printf "[TRT][POST][$1][${appPostTrtFct[1]}]" eval "${appPostTrtFct[1]}" fi done @@ -441,7 +440,7 @@ function processAppTrtFct () { for i in $AppsPreTrtFct; do appPreTrtFct=(${i//;/ }) if [ "${appPreTrtFct[0]}" == "$1" ]; then - printf "[TRT][PRE][$1][${appPreTrtFct[1]}]\n" + printf "[TRT][PRE][$1][${appPreTrtFct[1]}]" eval "${appPreTrtFct[1]}" fi done diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index d1ece12..7daf0aa 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1324,6 +1324,7 @@ function plank_PostTrtFct () { && cd plank-themer-master/ \ && rm -fR ~/.config/plank/dock1/theme_index; \ rm -fR ~/.config/plank/dock1/themes-repo; \ + mkdir -p ~/.config/plank/dock1; \ cp -a theme_index/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \ && cd ~ \ diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 480c3a1..9b4d222 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1130,6 +1130,7 @@ function plank_PostTrtFct () { && cd plank-themer-master/ \ && rm -fR ~/.config/plank/dock1/theme_index; \ rm -fR ~/.config/plank/dock1/themes-repo; \ + mkdir -p ~/.config/plank/dock1; \ cp -a theme_index/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \ && cd ~ \ diff --git a/yggdrasil.sh b/yggdrasil.sh index 748f0e2..95a0442 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -17,12 +17,12 @@ source /opt/yggdrasil/tools_functions.sh OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` case $OS in - *"Ubuntu 18.04 LTS"* | *"Linux Mint 18"*) + *"Ubuntu 16.04"* | *"Linux Mint 18"*) source /opt/yggdrasil/repo_functions_ub1604.sh source /opt/yggdrasil/install_functions_ub1604.sh source /opt/yggdrasil/menus_functions_ub1604.sh ;; - *"Ubuntu 18.04 LTS"* | *"Linux Mint 19"*) + *"Ubuntu 18.04"* | *"Linux Mint 19"*) source /opt/yggdrasil/repo_functions_ub1804.sh source /opt/yggdrasil/install_functions_ub1804.sh source /opt/yggdrasil/menus_functions_ub1804.sh