From 4234c835e10af1e918b1cbcf68579b4634f53570 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 10 May 2023 00:05:39 -0500 Subject: [PATCH] updates --- compress.sh | 4 ++-- installers/fedora-silverblue/main-container-setup.sh | 2 ++ unrar | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compress.sh b/compress.sh index ad13b3b..34a62fa 100755 --- a/compress.sh +++ b/compress.sh @@ -57,7 +57,7 @@ compress() { extract() { set -f - FILE="$(echo "$1" | xargs)" #use xargs to trim whitespace + FILE="$(echo "$1" | xargs -0)" #use xargs to trim whitespace DIR="$(basename "$FILE" | cut -f 1 -d '.')" mkdir "$DIR" case $FILE in @@ -65,7 +65,7 @@ extract() { *.tar.gz|*.tgz) tar xzvf "$FILE" --directory="$DIR";; *.tar.xz|*.txz) tar xJvf "$FILE" --directory="$DIR";; *.zip) unzip "$FILE" -d "$DIR";; - *.rar) unrar x "$FILE" "$DIR";; + *.rar) unrar-free -x "$FILE" "$DIR";; *.7z | *.crx) 7z x "$FILE" -o"$DIR";; esac } diff --git a/installers/fedora-silverblue/main-container-setup.sh b/installers/fedora-silverblue/main-container-setup.sh index 5937e5c..c71d9de 100644 --- a/installers/fedora-silverblue/main-container-setup.sh +++ b/installers/fedora-silverblue/main-container-setup.sh @@ -28,3 +28,5 @@ sudo dnf install rofi-wayland sudo dnf copr enable derisis13/ani-cli sudo dnf install ani-cli + +sudo dnf install p7zip p7zip-plugins unrar-free diff --git a/unrar b/unrar index 88ca30c..5f2c09e 100755 --- a/unrar +++ b/unrar @@ -6,7 +6,6 @@ # $2 -> archive file name ex: archive.rar # $3 -> (optional) directory to extract to - if [ "$1" = "x" ]; then if [ "$(echo "$2" | grep ".rar" )" ]; then if [ -d "$3" ]; then