0.5r9 - Executer

lch

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=0.5r8
+VERSION=0.5r9
 DEST=$1
 shift 1
 ORIG=$@
@@ -9,6 +9,9 @@ if [[ -e /usr/lib/lch/compressor.sh ]]; then . /usr/lib/lch/compressor.sh; else
 if [[ -e /usr/lib/lch/decompressor.sh ]]; then . /usr/lib/lch/decompressor.sh; else . ./lib/decompressor.sh; fi
 if [[ -e /usr/lib/lch/installer.sh ]]; then . /usr/lib/lch/installer.sh; else . ./lib/installer.sh; fi
 
+
+# executer tar -cvf $DEST $ORIG
+
 if [ "$DEST" = "--version" ] || [ "$DEST" = "-v" ]
 then
     echo "Linux Compression Humanized $VERSION"

lib/compressor.sh

@@ -4,76 +4,31 @@ function compressor()
 {
     case $(lowercase) in
         *.tar)
-            if [ -x "$(command -v tar)" ]
+            executer tar -cvf $DEST $ORIG
-            then
-                tar -cvf $DEST $ORIG
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.gz | *.tgz)
-            if [ -x "$(command -v tar)" ]
+            executer tar -czvf $DEST $ORIG
-            then
-                tar -czvf $DEST $ORIG
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.bz2 | *.tbz | *.tbz2 | *.tb2)
-            if [ -x "$(command -v tar)" ]
+            executer tar -c $ORIG | bzip2 > $DEST
-            then
-                tar -c $ORIG | bzip2 > $DEST
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.xz | *.txz)
-            if [ -x "$(command -v tar)" ]
+            executer tar -cJf $DEST $ORIG
-            then
-                tar -cJf $DEST $ORIG
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.bz2)
-            if [ -x "$(command -v bzip2)" ]
+            executer bzip2 -c $ORIG > $DEST
-            then
-                bzip2 -c $ORIG > $DEST
-            else
-                error_not_install "bzip2"
-            fi
         ;;
         *.gz)
-            if [ -x "$(command -v gzip)" ]
+            executer gzip -c $ORIG > $DEST
-            then
-                gzip -c $ORIG > $DEST
-            else
-                error_not_install "gzip"
-            fi
         ;;
         *.zip)
-            if [ -x "$(command -v zip)" ]
+            executer zip -r $DEST $ORIG
-            then
-                zip -r $DEST $ORIG
-            else
-                error_not_install "zip"
-            fi
         ;;
         *.7z)
-            if [ -x "$(command -v 7z)" ]
+            executer 7z a $DEST $ORIG
-            then
-                7z a $DEST $ORIG
-            else
-                error_not_install "7z"
-            fi
         ;;
         *.rar)
-            if [ -x "$(command -v rar)" ]
+            executer rar a $DEST $ORIG
-            then
-                rar a $DEST $ORIG
-            else
-                error_not_install "rar"
-            fi
         ;;
         *)
             echo "Extension not found."

lib/decompressor.sh

@@ -4,76 +4,31 @@ function decompressor()
 {
     case $(lowercase) in
         *.tar)
-            if [ -x "$(command -v tar)" ]
+            executer tar -xvf $DEST
-            then
-                tar -xvf $DEST
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.gz | *.tgz)
-            if [ -x "$(command -v tar)" ]
+            executer tar -xzvf $DEST
-            then
-                tar -xzvf $DEST
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.bz2 | *.tbz | *.tbz2 | *.tb2)
-            if [ -x "$(command -v tar)" ]
+            executer tar xjf $DEST
-            then
-                tar xjf $DEST
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.tar.xz | *.txz)
-            if [ -x "$(command -v tar)" ]
+            executer tar -xf $DEST
-            then
-                tar -xf $DEST
-            else
-                error_not_install "tar"
-            fi
         ;;
         *.bz2)
-            if [ -x "$(command -v bzip2)" ]
+            executer bzip2 -d $DEST
-            then
-                bzip2 -d $DEST
-            else
-                error_not_install "bzip2"
-            fi
         ;;
         *.gz)
-            if [ -x "$(command -v gzip)" ]
+            executer gzip -d $DEST
-            then
-                gzip -d $DEST
-            else
-                error_not_install "gzip"
-            fi
         ;;
         *.zip)
-            if [ -x "$(command -v unzip)" ]
+            executer unzip $DEST
-            then
-                unzip $DEST
-            else
-                error_not_install "unzip"
-            fi
         ;;
         *.7z | *.arj | *.cab | *.dmg | *.iso | *.lzh | *.lzma | *.rpm | *.squashfs | *.vdi | *.vhd | *.vmdk | *.win | *.xar | *.z)
-            if [ -x "$(command -v 7z)" ]
+            executer 7z e -y $DEST
-            then
-                7z e -y $DEST
-            else
-                error_not_install "7z"
-            fi
         ;;
         *.rar)
-            if [ -x "$(command -v unrar)" ]
+            executer unrar x $DEST
-            then
-                unrar x $DEST
-            else
-                error_not_install "unrar"
-            fi
         ;;
         *)
             echo "Extension not found."

lib/installer.sh

@@ -19,7 +19,7 @@ function rarInstall(){
         rm -r rar $RAR_FILE
         echo "rar/unrar installed."
     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 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
 }

lib/resources.sh

@@ -61,3 +61,13 @@ function error_not_install()
     echo -e "$@ \e[91mis not installed\e[0m, use 'lch -i' to install and 'lch -c' to check."
     exit 0
 }
+
+function executer()
+{
+    if [ -x "$(command -v $1)" ]
+    then
+        "$@"
+    else
+        error_not_install $1
+    fi
+}