From 399b5199b00b39467b8d44db69e47a97dced845e Mon Sep 17 00:00:00 2001 From: Bingzhang Dai Date: Wed, 24 Mar 2021 17:04:21 +0800 Subject: [PATCH] Update extract.plugin.bash, support to extract zip to target directory --- plugins/available/extract.plugin.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/available/extract.plugin.bash b/plugins/available/extract.plugin.bash index 719808e5..53f288e5 100644 --- a/plugins/available/extract.plugin.bash +++ b/plugins/available/extract.plugin.bash @@ -37,7 +37,7 @@ End-Of-Usage local -r filename=$(basename -- $1) local -r filedirname=$(dirname -- $1) - local targetdirname=$(sed 's/\(\.tar\.bz2$\|\.tbz$\|\.tbz2$\|\.tar\.gz$\|\.tgz$\|\.tar$\|\.tar\.xz$\|\.txz$\|\.tar\.Z$\|\.7z$\)//g' <<< $filename) + local targetdirname=$(sed 's/\(\.tar\.bz2$\|\.tbz$\|\.tbz2$\|\.tar\.gz$\|\.tgz$\|\.tar$\|\.tar\.xz$\|\.txz$\|\.tar\.Z$\|\.7z$\|\.nupkg$\|\.zip$\|\.war$\|\.jar$\)//g' <<< $filename) if [ "$filename" = "$targetdirname" ]; then # archive type either not supported or it doesn't need dir creation targetdirname="" @@ -61,7 +61,7 @@ End-Of-Usage *.rpm) rpm2cpio "$1" | cpio -idm${verbose} ;; *.tar) tar "x${verbose}f" "$1" -C "$filedirname/$targetdirname" ;; *.xz) xz --decompress "$1" ;; - *.zip|*.war|*.jar) unzip "$1" ;; + *.zip|*.war|*.jar|*.nupkg) unzip "$1" -d "$filedirname/$targetdirname" ;; *.Z) uncompress "$1" ;; *.7z) 7za x "$1" ;; *) echo "'$1' cannot be extracted via extract" >&2;;