Merge pull request '0.6-stable' (#2) from 0.6-dev into master

Reviewed-on: https://gitea.hatthieves.es/cloud/lch/pulls/2

lch

@@ -1,16 +1,13 @@
 #!/usr/bin/env bash
-VERSION=0.5r9
+VERSION=0.6r8
 DEST=$1
 shift 1
 ORIG=$@
 
-if [[ -e /usr/lib/lch/resources.sh ]]; then . /usr/lib/lch/resources.sh; else . ./lib/resources.sh; fi
+if [[ -e  ./lib/resources.sh ]]; then . ./lib/resources.sh; else . /usr/lib/lch/resources.sh; fi
-if [[ -e /usr/lib/lch/compressor.sh ]]; then . /usr/lib/lch/compressor.sh; else . ./lib/compressor.sh; fi
+if [[ -e  ./lib/compressor.sh ]]; then . ./lib/compressor.sh; else . /usr/lib/lch/compressor.sh; fi
-if [[ -e /usr/lib/lch/decompressor.sh ]]; then . /usr/lib/lch/decompressor.sh; else . ./lib/decompressor.sh; fi
+if [[ -e  ./lib/decompressor.sh ]]; then . ./lib/decompressor.sh; else . /usr/lib/lch/decompressor.sh; fi
-if [[ -e /usr/lib/lch/installer.sh ]]; then . /usr/lib/lch/installer.sh; else . ./lib/installer.sh; fi
+if [[ -e  ./lib/installer.sh ]]; then . ./lib/installer.sh; else . /usr/lib/lch/installer.sh; fi
-
-
-# executer tar -cvf $DEST $ORIG
 
 if [ "$DEST" = "--version" ] || [ "$DEST" = "-v" ]
 then

lib/compressor.sh

@@ -36,5 +36,5 @@ function compressor()
         ;;
     esac
 
-    echo -e "\nDone"
+    echo -e "\nFile $DEST compressed."
-}
+}

lib/decompressor.sh

@@ -36,5 +36,5 @@ function decompressor()
         ;;
     esac
     
-    echo -e "\nDone"
+    echo -e "\nFile $DEST decompressed."
 }

lib/installer.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function rarInstall(){
-    if [ -e "$(command -v wget)" ]
+    if [ -e "$(command -v wget)" ] || [ -e "$(command -v curl)" ]
     then
         if [[ "$(uname -m)" == "x86_64" ]]
         then
@@ -11,74 +11,61 @@ function rarInstall(){
             RAR_URL="https://www.rarlab.com/rar/rarlinux-5.9.1.tar.gz"
             RAR_FILE="rarlinux-5.9.1.tar.gz"
         fi
-        wget $RAR_URL 
+        if [ -e "$(command -v wget)" ]
-        tar -zxvf $RAR_FILE
+        then
+            wget -q $RAR_URL  > /dev/null
+        else
+            curl -s -o $RAR_FILE $RAR_URL > /dev/null
+        fi
+        tar -zxvf $RAR_FILE  > /dev/null
         cd rar
-        cp -v rar unrar /usr/local/bin/
+        cp -v rar unrar /usr/local/bin/ > /dev/null
         cd ..
-        rm -r rar $RAR_FILE
+        rm -r rar $RAR_FILE  > /dev/null
-        echo "rar/unrar installed."
+        complete_install "rar"
     else
-        echo -e "\n\e[91m[Error]\e[0m - wget is not installed, so rar could not be installed.\nPlease install wget.\n"
+        echo -e "\n\e[91m[Error]\e[0m - wget or curl is not installed, so rar could not be installed.\nPlease install wget.\n"
         read -p "Press [ENTER] to continue installing or [CTRL+C] to exit."
     fi
 }
 
 function install()
 {
-    echo -e "Install dependencies\n"
-
     if [ "$UID" != "0" ]; then 
         echo " Only root can execute this script, sorry."
         echo " Try 'sudo lch $@'"
         exit 0
     fi
-    
+
-    if [ -e "$(command -v rar)" ]
+    if [ $# -eq 1 ]; then 
-    then
+        # Poner aviso "Vamos a instalarlo todo y mucho"
-        echo "rar installed."
+        read -p "Do you want to install non-free software? (rar, unrar) [y/N]: " PRIVSOFT
+        case ${PRIVSOFT} in
+            y | Y | yes)
+                PRIVSOFT=true
+                echo -e "\nInstall all dependencies (with non-free)\n";;
+            *)
+                PRIVSOFT=false
+                echo -e "\nOnly will install free software.\n";;
+        esac
     else
-        read -p "Do you want to install non-free software? (rar, unrar) [Y/N]: " PRIVSOFT
+        PRIVSOFT=false
-            case ${PRIVSOFT} in
-                y|Y)
-                    rarInstall;;
-                n|N)
-                    echo -e "\nOnly will install free software.\n";;
-                *)
-                    echo -e "Options: 'Y' or 'N': ";;
-            esac
     fi
-        
+
     if [ -x "$(command -v apt)" ]
     then
-        echo -e "APT system detected\n"
+        if [[ -e  ./lib/installers/deb.sh ]]; then . ./lib/installers/deb.sh; else . /usr/lib/lch/installers/deb.sh; fi
-        apt install -y tar bzip2 gzip zip unzip p7zip-full p7zip-rar 1> /dev/null
-    elif [ -n "$(grep "centos" /etc/*-release)" ]
-    then
-        echo -e "CentOS system detected\n"
-        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 [ -x "$(command -v dnf)" ]
-    then
-        echo -e "DNF system detected\n"
-        dnf install -y -q tar bzip2 gzip zip unzip p7zip p7zip-plugins 1> /dev/null
     elif [ -x "$(command -v yum)" ]
     then
-        echo -e "Yum system detected\n"
+       if [[ -e  ./lib/installers/rpm.sh ]]; then . ./lib/installers/rpm.sh; else . /usr/lib/lch/installers/rpm.sh; fi
-        yum install -y -q tar bzip2 gzip zip unzip p7zip p7zip-plugins 1> /dev/null
     elif [ -x "$(command -v pacman)" ]
     then
-        echo -e "Pacman system detected\n"
+        if [[ -e  ./lib/installers/pacman.sh ]]; then . ./lib/installers/pacman.sh; else . /usr/lib/lch/installers/pacman.sh; fi
-        pacman -Sqy --noconfirm tar bzip2 gzip zip unzip p7zip 1> /dev/null
     elif [ -x "$(command -v zypper)" ]
     then
-        echo -e "Zypper system detected\n"
+        if [[ -e  ./lib/installers/zypper.sh ]]; then . ./lib/installers/zypper.sh; else . /usr/lib/lch/installers/zypper.sh; fi
-        zypper install -y tar bzip2 gzip zip unzip p7zip-full 1> /dev/null
     else
-        echo -e "System installer not detected\n"
+        echo -e "System installer not detected"
     fi
 
     echo -e "\nDependencies installation finished\n"

lib/installers/deb.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Functions
+
+function get_dep(){
+    wheel true &
+    WPID=$!
+    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
+    disown $WPID
+    kill $WPID &> /dev/null
+}
+
+# Run
+
+echo -e "APT system detected"
+echo "---------------------"
+
+wheel true &
+WPID=$!
+apt-get update 1> /dev/null
+disown $WPID
+kill $WPID &> /dev/null
+
+
+if [ $# -eq 1 ]; then 
+    if $PRIVSOFT; then 
+        rarInstall
+    fi
+    for installer in "tar" "bzip2" "gzip" "zip" "unzip" "p7zip-full"
+      do get_dep $installer
+    done
+else
+    for i in $@
+    do
+        if [ $i -ne "-i" ]
+        then
+            case $i in
+                "rar" | "unrar")
+                    rarInstall
+                ;;
+                "7z" | "7zip" | "p7zip")
+                    get_dep p7zip-full
+                ;;
+                *)
+                    get_dep $i
+                ;;
+            esac
+        fi
+    done
+fi

lib/installers/pacman.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# Function
+
+function get_dep(){
+    wheel true &
+    WPID=$!
+    pacman -Sqy --noconfirm $@ &> /dev/null
+    if [[ $? -ne 0 ]]; then
+        if [[ $@ == "p7zip" ]]; then failed_install 7z; else failed_install $@; fi
+    else
+        if [[ $@ == "p7zip" ]]; then complete_install 7z; else complete_install $@; fi
+    fi
+    disown $WPID
+    kill $WPID &> /dev/null
+}
+
+# Run
+echo -e "Pacman system detected"
+echo "---------------------"
+
+wheel true &
+WPID=$!
+pacman -F -y 1> /dev/null
+disown $WPID
+kill $WPID &> /dev/null
+
+if [ $# -eq 1 ]; then 
+    if $PRIVSOFT; then 
+        rarInstall
+    fi
+    for installer in "tar" "bzip2" "gzip" "zip" "unzip" "p7zip"
+      do get_dep $installer
+    done
+else
+    for i in $@
+    do
+        if [ $i -ne "-i" ]
+        then
+            case $i in
+                "rar" | "unrar")
+                    rarInstall
+                ;;
+                "7z" | "7zip" | "p7zip")
+                    get_dep p7zip
+                ;;
+                *)
+                    get_dep $i
+                ;;
+            esac
+        fi
+    done
+fi

lib/installers/rpm.sh

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+# Functions
+
+function get_dep(){
+    wheel true &
+    WPID=$!
+    if [[ $@ == "p7zip-plugins" ]]; then
+        yum install -y -q $@ 1> /dev/null
+    else
+        yum install -y -q $@ 1> /dev/null
+        if [[ $? -ne 0 ]]; then
+            if [[ $@ == "p7zip" ]]; then failed_install 7z; else failed_install $@; fi
+        else
+            if [[ $@ == "p7zip" ]]; then complete_install 7z; else complete_install $@; fi
+        fi
+    fi
+    disown $WPID
+    kill $WPID &> /dev/null
+}
+
+function install_centos(){
+    if [ -n "$(grep "centos" /etc/*-release)" ]; then
+        yum install -y -q epel-release &> /dev/null
+        rpm --quiet --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8 &> /dev/null
+        rpm -U --quiet http://mirrors.kernel.org/fedora-epel/6/i386/epel-release-6-8.noarch.rpm &> /dev/null
+    fi
+}
+
+# Run
+
+echo -e "YUM system detected"
+echo "---------------------"
+
+wheel true &
+WPID=$!
+yum -y -q update &> /dev/null
+disown $WPID
+kill $WPID &> /dev/null
+
+if [ $# -eq 1 ]; then 
+    install_centos
+    if $PRIVSOFT; then 
+        rarInstall
+    fi
+    for installer in "tar" "bzip2" "gzip" "zip" "unzip" "p7zip" "p7zip-plugins"
+      do get_dep $installer
+    done
+else
+    for i in $@
+    do
+        if [ $i -ne "-i" ]
+        then
+            case $i in
+                "rar" | "unrar")
+                    rarInstall
+                ;;
+                "7z" | "7zip" | "p7zip")
+                    install_centos
+                    get_dep p7zip
+                    get_dep p7zip-plugins
+                ;;
+                *)
+                    get_dep $i
+                ;;
+            esac
+        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

lib/installers/zypper.sh

@@ -0,0 +1,54 @@
+
+#!/usr/bin/env bash
+
+# Function
+
+function get_dep(){
+    wheel true &
+    WPID=$!
+    zypper 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
+    disown $WPID
+    kill $WPID &> /dev/null
+}
+
+# Run
+echo -e "Zypper system detected"
+echo "---------------------"
+
+wheel true &
+WPID=$!
+zypper -q up -y 1> /dev/null
+disown $WPID
+kill $WPID &> /dev/null
+
+if [ $# -eq 1 ]; then 
+    if $PRIVSOFT; then 
+        rarInstall
+    fi
+    for installer in "tar" "bzip2" "gzip" "zip" "unzip" "p7zip-full"
+      do get_dep $installer
+    done
+else
+    for i in $@
+    do
+        if [ $i -ne "-i" ]
+        then
+            case $i in
+                "rar" | "unrar")
+                    rarInstall
+                ;;
+                "7z" | "7zip" | "p7zip")
+                    get_dep p7zip-full
+                ;;
+                *)
+                    get_dep $i
+                ;;
+            esac
+        fi
+    done
+fi

lib/resources.sh

@@ -34,6 +34,8 @@ function check()
     echo "----------------------------------"
     for i in "7z" "bzip2" "gzip" "rar" "tar" "unrar" "unzip" "zip"
     do
+        wheel true &
+        WPID=$!
         if ! [ -x "$(command -v $i)" ]
         then
             echo -e "$i\t\t\t\e[91mNot Installed\e[0m"
@@ -41,6 +43,8 @@ function check()
         else
             echo -e "$i\t\t\t\e[32mInstalled\e[0m"
         fi
+        disown $WPID
+        kill $WPID &> /dev/null
     done
 
     if $a
@@ -64,10 +68,31 @@ function error_not_install()
 
 function executer()
 {
+    wheel true &
+    WPID=$!
     if [ -x "$(command -v $1)" ]
     then
-        "$@"
+        "$@" 1> /dev/null
     else
         error_not_install $1
     fi
+    disown $WPID
+    kill $WPID &> /dev/null
+}
+
+function complete_install(){
+    echo -e "$@:\t\t\t\e[32mComplete\e[0m"
+}
+
+function failed_install(){
+    echo -e "$@:\t\t\t\e[91mFailed\e[0m"
+}
+
+function wheel() {
+    sp='/-\|'
+    while $1; do
+        printf '%.1s\b' "$sp"
+        sp=${sp#?}${sp%???}
+        sleep 0.1s
+    done
 }