From 5a1696bf13c010f96990369d83ca6089c9a1f790 Mon Sep 17 00:00:00 2001 From: radikal Date: Sun, 4 Oct 2020 16:14:40 +0200 Subject: [PATCH] Minor fixes --- README.md | 2 +- lib/installer.sh | 2 +- lib/installers/rpm.sh | 19 ------------------- lib/resources.sh | 17 +++++++++++------ 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 827b0e3..b58cff6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Tool that extract or compress files automatically in a simple & easy way. It keeps the kiss philosophy avoiding to memorize weird flags and commands to extract & compress files. -It allows you to auto install dependencies or even propietary dependencies if requested. +It allows you to auto install dependencies or even proprietary dependencies if requested. ## Installation diff --git a/lib/installer.sh b/lib/installer.sh index ef24acc..39e94d9 100644 --- a/lib/installer.sh +++ b/lib/installer.sh @@ -24,7 +24,7 @@ function rarInstall(){ rm -r rar $RAR_FILE > /dev/null complete_install "rar" else - echo -e "\n\e[91m[Error]\e[0m - wget or curl is not installed, so rar could not be installed.\nPlease install wget.\n" + echo -e "\n$RED[Error]$RESET - wget or curl are not in the system, so rar could not be installed.\nPlease, install wget or curl.\n" read -p "Press [ENTER] to continue installing or [CTRL+C] to exit." fi } diff --git a/lib/installers/rpm.sh b/lib/installers/rpm.sh index c568277..c9226dd 100644 --- a/lib/installers/rpm.sh +++ b/lib/installers/rpm.sh @@ -67,22 +67,3 @@ else fi done fi - - -# [ -n "$(grep "centos" /etc/*-release)" ] - - -# echo -e "CentOS system detected" -# yum install -y -q epel-release 1> /dev/null -# rpm -U --quiet http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm 1> /dev/null -# rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-6 1> /dev/null -# yum repolist 1> /dev/null -# yum install -y -q tar bzip2 gzip zip unzip p7zip p7zip-plugins 1> /dev/null -# elif -# then -# echo -e "DNF system detected" -# dnf install -y -q tar bzip2 gzip zip unzip p7zip p7zip-plugins 1> /dev/null -# elif -# then -# echo -e "Yum system detected" -# yum install -y -q tar bzip2 gzip zip unzip p7zip p7zip-plugins 1> /dev/null \ No newline at end of file diff --git a/lib/resources.sh b/lib/resources.sh index 73e296c..b4eddf9 100644 --- a/lib/resources.sh +++ b/lib/resources.sh @@ -1,5 +1,10 @@ #!/usr/bin/env bash +# Colors +RESET="\e[0m" +GREEN="\e[32m" +RED="\e[91m" + function help() { echo "Help:" @@ -10,7 +15,7 @@ function help() echo "Examples:" echo "$ lch -h - This help" echo "$ lch -v - Print version" - echo "$ lch -c - Check compresion systems" + echo "$ lch -c - Check compression systems" echo "$ lch -i - Install the compressors dependencies" echo "$ lch file.zip - Decompress" echo "$ lch file.zip /home/file - Compress" @@ -38,10 +43,10 @@ function check() WPID=$! if ! [ -x "$(command -v $i)" ] then - echo -e "$i\t\t\t\e[91mNot Installed\e[0m" + echo -e "$i$RED\t\t\tNot Installed$RESET" a=true else - echo -e "$i\t\t\t\e[32mInstalled\e[0m" + echo -e "$i$GREEN\t\t\tInstalled$RESET" fi disown $WPID kill $WPID &> /dev/null @@ -62,7 +67,7 @@ function lowercase() function error_not_install() { - echo -e "$@ \e[91mis not installed\e[0m, use 'lch -i' to install and 'lch -c' to check." + echo -e "$@$RED is not installed$RESET, use 'lch -c' to check and 'lch -i' to install." exit 0 } @@ -81,11 +86,11 @@ function executer() } function complete_install(){ - echo -e "$@:\t\t\t\e[32mComplete\e[0m" + echo -e "$@:$GREEN\t\t\tCompleted$RESET" } function failed_install(){ - echo -e "$@:\t\t\t\e[91mFailed\e[0m" + echo -e "$@:$RED\t\t\tFailed$RESET" } function wheel() {