psi-jack
/
zimfw
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

[archive] Support unarchive of multiple files 

so we can do `unarchive *.tar.gz` for example.

Update README and compdef accordingly.
This commit is contained in:
Eric Nielsen 2018-12-07 12:55:06 -05:00
parent 1e3cee4715
commit 2004fb320b
3 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/archive/README.md
View File

@ -9,7 +9,7 @@ Functions
--------- ---------
* `archive` generates an archive based on file extension. Syntax is `archive myarchive.tar.gz /path/to/archive` * `archive` generates an archive based on file extension. Syntax is `archive myarchive.tar.gz /path/to/archive`
* `unarchive` unarchives a file based on the extension. Syntax is `unarchive myarchive.7z` * `unarchive` unarchives files based on the extensions. Syntax is `unarchive myarchive.7z`
Archive formats Archive formats
--------------- ---------------

2
modules/archive/functions/_unarchive
View File

@ -1,4 +1,4 @@
#compdef unarchive #compdef unarchive
_arguments \ _arguments \
":archive:_files -g '(#i)*.(tar|gz|tgz|bz2|tbz|tbz2|xz|txz|tlz|lzma|Z|zip|rar|7z|001)(-.)'" "*:archive:_files -g '(#i)*.(tar|gz|tgz|bz|bz2|tbz|tbz2|xz|txz|tlz|lzma|Z|zip|rar|7z|001)(-.)'"

51
modules/archive/functions/unarchive
View File

@ -3,32 +3,39 @@
# Unarchives files # Unarchives files
# #
if (( # != 1 )); then if (( # < 1 )); then
print "usage: ${0} <archive_name.ext>" >&2 print "usage: ${0} <archive_name.ext>..." >&2
return 1 return 1
fi fi
local archive_name="${1}" setopt LOCAL_OPTIONS ERR_RETURN
# using unpigz/pbunzip2 provides little to decompression time; the benefit is mainly in compression time. # using unpigz/pbunzip2 provides little to decompression time; the benefit is mainly in compression time.
# setting it as an alias in the init.zsh file should be sufficient here. # setting it as an alias in the init.zsh file should be sufficient here.
case "${archive_name}" in while (( # > 0 )); do
(*.tar.gz|*.tgz) tar -xvzf "${archive_name}" ;; local archive_name="${1}"
(*.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar -xvjf "${archive_name}" ;; case "${archive_name}" in
(*.tar.xz|*.txz) tar -J --help &>/dev/null && tar -xvJf "${archive_name}" \ (*.tar.gz|*.tgz) tar -xvzf "${archive_name}" ;;
|| xzcat "${archive_name}" | tar xvf - ;; (*.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar -xvjf "${archive_name}" ;;
(*.tar.lzma|*.tlz) tar --lzma --help &>/dev/null && tar --lzma -xvf "${archive_name}" \ (*.tar.xz|*.txz) tar -J --help &>/dev/null && tar -xvJf "${archive_name}" \
|| lzcat "${archive_name}" | tar xvf - ;; || xzcat "${archive_name}" | tar xvf - ;;
(*.tar) tar xvf "${archive_name}" ;; (*.tar.lzma|*.tlz) tar --lzma --help &>/dev/null && tar --lzma -xvf "${archive_name}" \
(*.gz) gunzip "${archive_name}" ;; || lzcat "${archive_name}" | tar xvf - ;;
(*.bz|*.bz2) bunzip2 "${archive_name}" ;; (*.tar) tar xvf "${archive_name}" ;;
(*.xz) unxz "${archive_name}" ;; (*.gz) gunzip "${archive_name}" ;;
(*.lzma) unlzma "${archive_name}" ;; (*.bz|*.bz2) bunzip2 "${archive_name}" ;;
(*.Z) uncompress "${archive_name}" ;; (*.xz) unxz "${archive_name}" ;;
(*.zip) unzip "${archive_name}";; (*.lzma) unlzma "${archive_name}" ;;
(*.rar) (( $+{commands[unrar]} )) && unrar x -ad "${archive_name}" \ (*.Z) uncompress "${archive_name}" ;;
|| rar x -ad "${archive_name}" ;; (*.zip) unzip "${archive_name}";;
(*.7z|*.001) 7za x "${archive_name}" ;; (*.rar) (( $+{commands[unrar]} )) && unrar x -ad "${archive_name}" \
(*) print "${0}: unknown archive type: ${archive_name}" ;; || rar x -ad "${archive_name}" ;;
esac (*.7z|*.001) 7za x "${archive_name}" ;;
(*)
print "${0}: unknown archive type: ${archive_name}"
return 1
;;
esac
shift
done