Merge branch '0.6r10' of https://gitea.hatthieves.es/cloud/lch into 0.6r10

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

.drone.yml

@@ -0,0 +1,38 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: Build Ubuntu deb package
+  image: ubuntu
+  volumes:
+  - name: deb_packages
+    path: /debian
+  commands:
+    - export DEBIAN_FRONTEND=noninteractive
+    - apt-get update && apt-get install -y dpkg-dev debhelper
+    - dpkg-buildpackage -us -uc
+    - cp ../*.deb .
+    - dpkg -i *.deb
+    - rm -rf /debian/* && cp *.deb /debian
+    - lch -v
+
+- name: Build CentOS rpm package
+  image: centos
+  volumes: 
+  - name: rpm_packages
+    path: /root/rpmbuild/RPMS/noarch/
+  commands:
+    - yum -qy install rpm-build
+    - rm -rf /root/rpmbuild/RPMS/noarch/*
+    - rpmbuild --target noarch -bb lch.spec
+    - rpm -i /root/rpmbuild/RPMS/noarch/*.rpm
+    - lch -v
+
+volumes:
+- name: deb_packages
+  host:
+    path: /opt/docker/production/lch-web/web/deb
+- name: rpm_packages
+  host:
+    path: /opt/docker/production/lch-web/web/rpm

.gitignore

@@ -0,0 +1,5 @@
+debian/lch/
+debian/.debhelper/
+debian/debhelper-build-stamp
+debian/files
+debian/lch.substvars

LICENSE

@@ -0,0 +1,23 @@
+Copyright (c) 2020 - by Hatthieves 
+
+Portions of this software are licensed as follows:
+
+* All third party components incorporated into the Hatthieves Software are licensed under the original license provided by the owner of the applicable component.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,15 +1,19 @@
 # Linux compressor humanizer
 
+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 proprietary dependencies if requested.
+
 ## Installation
 
 ###### install
 ```
-sudo ./install.sh
+sudo ./bin/install.sh
 ```
 
 ###### Uninstall
 ```
-sudo ./uninstall.sh
+sudo ./bin/uninstall.sh
 ```
 
 ## Usage
@@ -65,4 +69,4 @@ $ lch -i                       - Install the compressors dependencies
 ```
 $ git clone https://gitea.hatthieves.es/cloud/lch
 $ cd lch && docker run -it --rm --name lch --workdir /lch -v $(pwd):/lch putyourdistributionhere ./lch -h
-```
+```

bin/install.sh

@@ -2,7 +2,7 @@
 
 if [ "$UID" != "0" ]; then 
   echo " Only root can execute this script, sorry."
-  echo " Try 'sudo ./install.sh'"
+  echo " Try 'sudo $0'"
   exit 0
 fi
 
@@ -13,7 +13,7 @@ echo "======================"
 echo ""
 cp lch /usr/bin/lch
 mkdir -p /usr/lib/lch
-cp ./lib/* /usr/lib/lch
+cp -r ./lib/* /usr/lib/lch
 chmod 755 /usr/bin/lch
 echo " Copied lch in /usr/bin"
 
@@ -26,7 +26,7 @@ if [ -x "$(command -v man)" ]; then
 
     MANDIR=${MANPATH%%:*}/man1 
     mkdir -p $MANDIR
-    cp lch.1 $MANDIR/lch.1
+    cp man/lch.1 $MANDIR/lch.1
     gzip $MANDIR/lch.1
     chmod 644 $MANDIR/lch.1.gz
     echo " Copied manpage in $MANDIR"

debian/changelog

@@ -0,0 +1,5 @@
+lch (0.6.10) unstable; urgency=medium
+
+  * Initial release.
+
+ -- Pedro Berrocal <pberr@hatthieves.es>  Sun, 04 Oct 2020 00:51:43 +0200

debian/compat

@@ -0,0 +1 @@
+10

debian/control

@@ -0,0 +1,10 @@
+Source: lch
+Maintainer: Pedro Berrocal <pberr@hatthieves.es>
+Standards-Version: 0.6.10
+Section: utils
+Build-Depends: debhelper (>= 10.2.5)
+
+Package: lch
+Architecture: all
+Description: Linux Compressor Humanizer
+    Download it and forget about writing arguments.

debian/copyright

@@ -0,0 +1,7 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: falcot-data
+
+Files: *
+Copyright: 2004-2019 Hatthieves
+License:
+ All rights reserved.

debian/postrm

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+if [ "$UID" != "0" ]; then 
+  echo " Only root can execute this script, sorry."
+  echo " Try 'sudo $0'"
+  exit 0
+fi
+
+# Si existe el archivo lch
+if [[ -f "/usr/bin/lch" ]]; then
+  rm /usr/bin/lch
+fi
+
+# Si existe el directorio lch
+if [[ -d "/usr/lib/lch" ]]; then
+  rm -rf "/usr/lib/lch"
+fi
+
+# Si existe man
+if [ -x "$(command -v man)" ]; then
+    # Si nulo manpath
+    if [ -z "$MANPATH" ]; then
+        MANPATH=$(manpath)
+    fi
+
+    MANDIR=${MANPATH%%:*}/man1
+
+    # Si man lch.1
+    if [[ -f "$MANDIR/lch.1" ]]; then
+        rm "$MANDIR/lch.1"
+    fi
+
+    # Si man lch.1.gz
+    if [[ -f "$MANDIR/lch.1.gz" ]]; then
+        rm "$MANDIR/lch.1.gz"
+    fi
+fi
+
+echo "=============================="
+echo " lch uninstalled successfully."
+echo -e "==============================\n"

debian/rules

@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_usrlocal:
+
+override_dh_auto_install:
+	./bin/install.sh
+
+configure:
+
+clean:
+	dh_autoreconf_clean
+	dh_clean

lch

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=0.6r8
+VERSION=0.6r10
 DEST=$1
 shift 1
 ORIG=$@

lch.spec

@@ -0,0 +1,44 @@
+###############################################################################
+# Spec file for lch
+################################################################################
+# Configured to be built by user student or other non-root user
+################################################################################
+#
+Summary: Linux Compress Humanizer
+Name: lch
+Version: 0.6
+Release: 10
+License: GPL
+URL: https://lch.hatthieves.es
+Group: System
+Packager: HatThieves
+Requires: bash
+BuildRoot: ./rpmbuild/
+
+# Build with the following syntax:
+# rpmbuild --target noarch -bb utils.spec
+
+%description
+Linux Compress Humanizer
+
+%prep
+################################################################################
+# Create the build tree and copy the files from the development directories    #
+# into the build tree.                                                         #
+################################################################################
+echo "BUILDROOT = $RPM_BUILD_ROOT"
+mkdir -p $RPM_BUILD_ROOT/usr/bin
+mkdir -p $RPM_BUILD_ROOT/usr/lib/lch
+
+cp $OLDPWD/lch $RPM_BUILD_ROOT/usr/bin
+cp -r $OLDPWD/lib/* $RPM_BUILD_ROOT/usr/lib/lch
+
+exit
+
+%files
+%attr(0755, root, root) /usr/bin/lch
+/usr/lib/lch/*
+
+%clean
+rm -f $RPM_BUILD_ROOT/usr/bin/lch
+rm -rf $RPM_BUILD_ROOT/usr/lib/lch

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
 }

lib/installers/deb.sh

@@ -37,7 +37,7 @@ if [ $# -eq 1 ]; then
 else
     for i in $@
     do
-        if [ $i -ne "-i" ]
+        if [ $i != "-i" ]
         then
             case $i in
                 "rar" | "unrar")

lib/installers/pacman.sh

@@ -35,7 +35,7 @@ if [ $# -eq 1 ]; then
 else
     for i in $@
     do
-        if [ $i -ne "-i" ]
+        if [ $i != "-i" ]
         then
             case $i in
                 "rar" | "unrar")

lib/installers/rpm.sh

@@ -49,7 +49,7 @@ if [ $# -eq 1 ]; then
 else
     for i in $@
     do
-        if [ $i -ne "-i" ]
+        if [ $i != "-i" ]
         then
             case $i in
                 "rar" | "unrar")
@@ -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

lib/installers/zypper.sh

@@ -36,7 +36,7 @@ if [ $# -eq 1 ]; then
 else
     for i in $@
     do
-        if [ $i -ne "-i" ]
+        if [ $i != "-i" ]
         then
             case $i in
                 "rar" | "unrar")

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() {
@@ -93,6 +98,11 @@ function wheel() {
     while $1; do
         printf '%.1s\b' "$sp"
         sp=${sp#?}${sp%???}
-        sleep 0.1s
+        if [ -x "$(command -v bc)" ]
+        then
+          sleep $(echo "0.0001*$(grep 'cpu MHz' /proc/cpuinfo | head -n1 | awk '{print $4}')" | bc -l)s
+        else
+          sleep 0.2s
+        fi
     done
-}
+}

man/lch.1

@@ -45,6 +45,6 @@ will compress file1 and file2 in file.tar.gz
 Report your bugs at <gore@hatthieves.es>
 
 .SH AUTHOR
-\fBlch\fP are by Gustavo Adolfo Mesa Roldan <gore@hackthieves.es>, radikal <radikal@disroot.org>.
+\fBlch\fP are by Gustavo Adolfo Mesa Roldan <gore@hatthieves.es>, radikal <radikal@disroot.org>, Ale Romero <ale@hatthieves.es>, Pedro Berrocal <pedro@hatthieves.es>, m <?@?>.
 
 This document is by radikal <radikal@disroot.org>.

rpmbuild/SPECS/lch.spec

@@ -0,0 +1 @@
+../../lch.spec