From 45c9a4185b5d74fbbe03449ff7c001e0fa8fc5f5 Mon Sep 17 00:00:00 2001 From: radikal Date: Tue, 29 Sep 2020 17:04:56 +0200 Subject: [PATCH] uppercase control --- lib/compressor.sh | 25 +++++++++++++++---------- lib/decompressor.sh | 24 ++++++++++++++---------- 2 files changed, 29 insertions(+), 20 deletions(-) diff --git a/lib/compressor.sh b/lib/compressor.sh index cddfe8a..52bc3b1 100644 --- a/lib/compressor.sh +++ b/lib/compressor.sh @@ -1,33 +1,38 @@ #!/bin/bash +function lowercase() +{ + echo "$DEST" | tr 'A-Z' 'a-z' +} + function compressor() { - case $1 in + case $(lowercase) in *.tar) - tar -cvf $1 $2 + tar -cvf $DEST $ORIG ;; *.tar.gz | *.tgz) - tar -czvf $1 $2 + tar -czvf $DEST $ORIG ;; *.tar.bz2 | *.tbz | *.tbz2 | *.tb2) - tar -c $2 | bzip2 > $1 + tar -c $ORIG | bzip2 > $DEST ;; *.tar.xz | *.txz) - tar -cJf $1 $2 + tar -cJf $DEST $ORIG ;; *.bz2) - bzip2 -c $2 > $1 + bzip2 -c $ORIG > $DEST ;; *.gz) - gzip -c $2 > $1 + gzip -c $ORIG > $DEST ;; *.zip) - zip -r $1 $2 + zip -r $DEST $ORIG ;; *.7z) - 7za a $1 $2 + 7za a $DEST $ORIG ;; *.rar) - rar a $1 $2 + rar a $DEST $ORIG ;; *) echo "Extension not found." diff --git a/lib/decompressor.sh b/lib/decompressor.sh index c58338c..36105b4 100644 --- a/lib/decompressor.sh +++ b/lib/decompressor.sh @@ -1,33 +1,37 @@ #!/bin/bash +function lowercase() +{ + echo "$DEST" | tr 'A-Z' 'a-z' +} function decompressor() { - case $1 in + case $(lowercase) in *.tar) - tar -xvf $1 + tar -xvf $DEST ;; *.tar.gz | *.tgz) - tar -xzvf $1 + tar -xzvf $DEST ;; *.tar.bz2 | *.tbz | *.tbz2 | *.tb2) - tar xjf $1 + tar xjf $DEST ;; *.tar.xz | *.txz) - tar -xf $1 + tar -xf $DEST ;; *.bz2) - bzip2 -d $1 + bzip2 -d $DEST ;; *.gz) - gzip -d $1 + gzip -d $DEST ;; *.zip) - unzip $1 + unzip $DEST ;; *.7z) - 7za e $1 + 7za e $DEST ;; *.rar) - unrar x $1 + unrar x $DEST ;; *) echo "Extension not found."