From 2b48268c304b0b711c66a21b0121f6f8a7bbed91 Mon Sep 17 00:00:00 2001 From: ale Date: Sat, 3 Oct 2020 12:42:16 +0200 Subject: [PATCH] 0.6r3 --- lch | 2 +- lib/installers/deb.sh | 20 +++++++++++--------- lib/resources.sh | 4 ++++ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/lch b/lch index 034326e..ae93a2f 100755 --- a/lch +++ b/lch @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERSION=0.6r2 +VERSION=0.6r3 DEST=$1 shift 1 ORIG=$@ diff --git a/lib/installers/deb.sh b/lib/installers/deb.sh index c2ce27e..447c9e3 100644 --- a/lib/installers/deb.sh +++ b/lib/installers/deb.sh @@ -3,9 +3,12 @@ # Function function get_dep(){ - # Busca la manera de capturar el error. Y mostrar mensaje en rojo. - apt-get install -y $@ 1> /dev/null - if [[ $@ == "p7zip-full" ]]; then complete_install 7z; else complete_install $@; fi + apt-get install -y $@ &> /dev/null + if [[ $? -ne 0 ]]; then + if [[ $@ == "p7zip-full" ]]; then failed_install 7z; else failed_install $@; fi + else + if [[ $@ == "p7zip-full" ]]; then complete_install 7z; else complete_install $@; fi + fi } # Run @@ -13,16 +16,15 @@ function get_dep(){ echo -e "APT system detected" echo "---------------------" +apt-get update 1> /dev/null + if [ $# -eq 1 ]; then if $PRIVSOFT; then rarInstall fi - get_dep tar - get_dep bzip2 - get_dep gzip - get_dep zip - get_dep unzip - get_dep p7zip-full + for installer in "tar" "bzip2" "gzip" "zip" "unzip" "p7zip-full" + do get_dep $installer + done else for i in $@ do diff --git a/lib/resources.sh b/lib/resources.sh index c4b6e2e..7dc0093 100644 --- a/lib/resources.sh +++ b/lib/resources.sh @@ -74,4 +74,8 @@ function executer() function complete_install(){ echo -e "$@:\t\t\t\e[32mComplete\e[0m" +} + +function failed_install(){ + echo -e "$@:\t\t\t\e[91mFailed\e[0m" } \ No newline at end of file