psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-23 15:55:34 -05:00
Code Issues Releases Wiki Activity
zimfw/modules/archive/functions/unarchive

35 lines
1.2 KiB
Text
Raw Normal View History

[archive] Allow archives in any directory Current code will create an archive in the current directory with: % archive ../test.tar.gz test.* or will complain that the following archive doesn't exist in the current directory (given it actually exists in the parent one): % unarchive ../test.tar.gz Fix that and allow archives in any directory. Other changes: * Use `<required_param>` instead of `[required_param]` in the usage text * Don't explictly check if archive exists in `unarchive`, but let the respective tool fail with its own message Closes #312
2018-11-24 22:45:08 -05:00
# vim:et sts=2 sw=2 ft=zsh
add archive module
2015-12-16 17:00:25 -05:00
#
# Unarchives files
#
[archive] Support archive of multiple files not just one directory. Also use shorter versions of the `tar` parameters, since we were using a mixture of the short and long ones among `archive` and `unarchive`. About not using `$` inside `(( ))`, this is what the the section ARITHMETIC EVALUATION in zshmisc(1) says: > Named parameters and subscripted arrays can be referenced by name > within an arithmetic expression without using the parameter expansion > syntax. And according to http://www.bash2zsh.com/zsh_refcard/refcard.pdf: > `var` (does not require `$` in front unless some substitution e.g. > `${#var}` is needed, `$` is error if `var` is to be modified) Closes #308
2018-11-14 20:32:37 -05:00
if (( # != 1 )); then
[archive] Allow archives in any directory Current code will create an archive in the current directory with: % archive ../test.tar.gz test.* or will complain that the following archive doesn't exist in the current directory (given it actually exists in the parent one): % unarchive ../test.tar.gz Fix that and allow archives in any directory. Other changes: * Use `<required_param>` instead of `[required_param]` in the usage text * Don't explictly check if archive exists in `unarchive`, but let the respective tool fail with its own message Closes #312
2018-11-24 22:45:08 -05:00
print "usage: ${0} <archive_name.ext>" >&2
cleanup function error messages
2016-01-07 15:36:31 -05:00
return 1
add archive module
2015-12-16 17:00:25 -05:00
fi
[archive] Allow archives in any directory Current code will create an archive in the current directory with: % archive ../test.tar.gz test.* or will complain that the following archive doesn't exist in the current directory (given it actually exists in the parent one): % unarchive ../test.tar.gz Fix that and allow archives in any directory. Other changes: * Use `<required_param>` instead of `[required_param]` in the usage text * Don't explictly check if archive exists in `unarchive`, but let the respective tool fail with its own message Closes #312
2018-11-24 22:45:08 -05:00
local archive_name="${1}"
add archive module
2015-12-16 17:00:25 -05:00
# using unpigz/pbunzip2 provides little to decompression time; the benefit is mainly in compression time.
fixup pigz and pbzip2 in (un)archive funcs
2015-12-19 17:08:43 -05:00
# setting it as an alias in the init.zsh file should be sufficient here.
add archive module
2015-12-16 17:00:25 -05:00
case "${archive_name}" in
(*.tar.gz|*.tgz) tar -xvzf "${archive_name}" ;;
[archive] Add missing bzip2 extensions We already had .tar.bz2, .tbz, .tbz2 and .bz2 We were missing .tar.bz and .bz Noticed this in the pull request #308 by @Konfekt.
2018-11-06 14:05:12 -05:00
(*.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar -xvjf "${archive_name}" ;;
[archive] Support archive of multiple files not just one directory. Also use shorter versions of the `tar` parameters, since we were using a mixture of the short and long ones among `archive` and `unarchive`. About not using `$` inside `(( ))`, this is what the the section ARITHMETIC EVALUATION in zshmisc(1) says: > Named parameters and subscripted arrays can be referenced by name > within an arithmetic expression without using the parameter expansion > syntax. And according to http://www.bash2zsh.com/zsh_refcard/refcard.pdf: > `var` (does not require `$` in front unless some substitution e.g. > `${#var}` is needed, `$` is error if `var` is to be modified) Closes #308
2018-11-14 20:32:37 -05:00
(*.tar.xz|*.txz) tar -J --help &>/dev/null && tar -xvJf "${archive_name}" \
add archive module
2015-12-16 17:00:25 -05:00
|| xzcat "${archive_name}" | tar xvf - ;;
[archive] Fix lzma typo Looks like nobody uses it, as the same typo is present in Oh-My-Zsh and Prezto... :- )
2018-02-08 11:03:30 -05:00
(*.tar.lzma|*.tlz) tar --lzma --help &>/dev/null && tar --lzma -xvf "${archive_name}" \
add archive module
2015-12-16 17:00:25 -05:00
|| lzcat "${archive_name}" | tar xvf - ;;
(*.tar) tar xvf "${archive_name}" ;;
(*.gz) gunzip "${archive_name}" ;;
[archive] Add missing bzip2 extensions We already had .tar.bz2, .tbz, .tbz2 and .bz2 We were missing .tar.bz and .bz Noticed this in the pull request #308 by @Konfekt.
2018-11-06 14:05:12 -05:00
(*.bz|*.bz2) bunzip2 "${archive_name}" ;;
add archive module
2015-12-16 17:00:25 -05:00
(*.xz) unxz "${archive_name}" ;;
(*.lzma) unlzma "${archive_name}" ;;
(*.Z) uncompress "${archive_name}" ;;
fix unzip in unarchive function
2015-12-17 14:04:33 -05:00
(*.zip) unzip "${archive_name}";;
[archive] Check unrar with commands array “unrar-free returns the error code 1 when run without arguments, thus failing the presence check.” as reported at sorin-ionescu/prezto#1383 Reformat code and use one-liners instead of if/then/fi. And we don’t need to separate local definitions from assignments anymore starting from zsh 5.2.
2018-02-07 18:27:59 -05:00
(*.rar) (( $+{commands[unrar]} )) && unrar x -ad "${archive_name}" \
add archive module
2015-12-16 17:00:25 -05:00
|| rar x -ad "${archive_name}" ;;
[archive] Support for multipart 7zip archives Cover all multipart archives created by 7zip Closes #221
2017-10-14 11:28:03 -04:00
(*.7z|*.001) 7za x "${archive_name}" ;;
add archive module
2015-12-16 17:00:25 -05:00
(*) print "${0}: unknown archive type: ${archive_name}" ;;
esac
Reference in a new issue Copy permalink