This commit is contained in:
shakasan 2018-05-30 09:09:12 +02:00
parent 806e5f0d09
commit bc8a46fd5d
4 changed files with 7 additions and 6 deletions

View file

@ -411,8 +411,7 @@ function addSpecificRepoFct () {
for i in $AppsRepo; do for i in $AppsRepo; do
appRepo=(${i//;/ }) appRepo=(${i//;/ })
if [ "${appRepo[0]}" == "$1" ]; then if [ "${appRepo[0]}" == "$1" ]; then
printf "[ADD] package -- $1 -- repo/ppa " printf "[ADD_REPP_PPA][$1][${appRepo[1]}]"
printf "added by function -- ${appRepo[1]}\n"
eval "${appRepo[1]}" eval "${appRepo[1]}"
repoAdded=$(($repoAdded+1)) repoAdded=$(($repoAdded+1))
fi fi
@ -433,7 +432,7 @@ function processAppTrtFct () {
for i in $AppsPostTrtFct; do for i in $AppsPostTrtFct; do
appPostTrtFct=(${i//;/ }) appPostTrtFct=(${i//;/ })
if [ "${appPostTrtFct[0]}" == "$1" ]; then if [ "${appPostTrtFct[0]}" == "$1" ]; then
printf "[TRT][POST][$1][${appPostTrtFct[1]}]\n" printf "[TRT][POST][$1][${appPostTrtFct[1]}]"
eval "${appPostTrtFct[1]}" eval "${appPostTrtFct[1]}"
fi fi
done done
@ -441,7 +440,7 @@ function processAppTrtFct () {
for i in $AppsPreTrtFct; do for i in $AppsPreTrtFct; do
appPreTrtFct=(${i//;/ }) appPreTrtFct=(${i//;/ })
if [ "${appPreTrtFct[0]}" == "$1" ]; then if [ "${appPreTrtFct[0]}" == "$1" ]; then
printf "[TRT][PRE][$1][${appPreTrtFct[1]}]\n" printf "[TRT][PRE][$1][${appPreTrtFct[1]}]"
eval "${appPreTrtFct[1]}" eval "${appPreTrtFct[1]}"
fi fi
done done

View file

@ -1324,6 +1324,7 @@ function plank_PostTrtFct () {
&& cd plank-themer-master/ \ && cd plank-themer-master/ \
&& rm -fR ~/.config/plank/dock1/theme_index; \ && rm -fR ~/.config/plank/dock1/theme_index; \
rm -fR ~/.config/plank/dock1/themes-repo; \ rm -fR ~/.config/plank/dock1/themes-repo; \
mkdir -p ~/.config/plank/dock1; \
cp -a theme_index/ ~/.config/plank/dock1 \ cp -a theme_index/ ~/.config/plank/dock1 \
&& cp -a themes-repo/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \
&& cd ~ \ && cd ~ \

View file

@ -1130,6 +1130,7 @@ function plank_PostTrtFct () {
&& cd plank-themer-master/ \ && cd plank-themer-master/ \
&& rm -fR ~/.config/plank/dock1/theme_index; \ && rm -fR ~/.config/plank/dock1/theme_index; \
rm -fR ~/.config/plank/dock1/themes-repo; \ rm -fR ~/.config/plank/dock1/themes-repo; \
mkdir -p ~/.config/plank/dock1; \
cp -a theme_index/ ~/.config/plank/dock1 \ cp -a theme_index/ ~/.config/plank/dock1 \
&& cp -a themes-repo/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \
&& cd ~ \ && cd ~ \

View file

@ -17,12 +17,12 @@ source /opt/yggdrasil/tools_functions.sh
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}'`
case $OS in 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/repo_functions_ub1604.sh
source /opt/yggdrasil/install_functions_ub1604.sh source /opt/yggdrasil/install_functions_ub1604.sh
source /opt/yggdrasil/menus_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/repo_functions_ub1804.sh
source /opt/yggdrasil/install_functions_ub1804.sh source /opt/yggdrasil/install_functions_ub1804.sh
source /opt/yggdrasil/menus_functions_ub1804.sh source /opt/yggdrasil/menus_functions_ub1804.sh