samba/zim
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
zim/modules/archive/functions/archive

35 lines
1.5 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-25 04:45:08 +01:00
# vim:et sts=2 sw=2 ft=zsh
add archive module
2015-12-16 23:00:25 +01:00
#
# Creates archive 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-15 02:32:37 +01:00
if (( # < 2 )); 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-25 04:45:08 +01:00
print "usage: ${0} <archive_name.ext> <file>..." >&2
cleanup function error messages
2016-01-07 21:36:31 +01:00
return 1
add archive module
2015-12-16 23:00:25 +01:00
fi
[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-15 02:32:37 +01:00
# we are quitting (above) if there are less than 2 vars,
add archive module
2015-12-16 23:00:25 +01:00
# so we don't need any argc check here.
[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-25 04:45:08 +01:00
local archive_name="${1}"
[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-15 02:32:37 +01:00
shift
add archive module
2015-12-16 23:00:25 +01:00
fixup pigz and pbzip2 in (un)archive funcs
2015-12-19 23:08:43 +01:00
# pigz and pbzip2 are aliased in the init.zsh file. This provides a significant speedup, resulting in a
# near-liner decrease in compression time based on on the number of available cores.
add archive module
2015-12-16 23:00:25 +01:00
case "${archive_name}" in
[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-15 02:32:37 +01:00
(*.tar.gz|*.tgz) tar -cvzf "${archive_name}" "${@}" ;;
(*.tar.bz|*.tar.bz2|*.tbz|*.tbz2) tar -cvjf "${archive_name}" "${@}" ;;
(*.tar.xz|*.txz) tar -J --help &>/dev/null && tar -cvJf "${archive_name}" "${@}" ;;
(*.tar.lzma|*.tlz) tar --lzma --help &>/dev/null && tar --lzma -cvf "${archive_name}" "${@}" ;;
(*.tar) tar -cvf "${archive_name}" "${@}" ;;
(*.zip) zip -r "${archive_name}" "${@}" ;;
(*.rar) rar a "${archive_name}" "${@}" ;;
(*.7z) 7za a "${archive_name}" "${@}" ;;
add archive module
2015-12-16 23:00:25 +01:00
(*.gz) print "${0}: .gz is only useful for single files, and does not capture permissions. Use .tar.gz" ;;
[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 20:05:12 +01:00
(*.bz|*.bz2) print "${0}: .bzip2 is only useful for single files, and does not capture permissions. Use .tar.bz2" ;;
add archive module
2015-12-16 23:00:25 +01:00
(*.xz) print "${0}: .xz is only useful for single files, and does not capture permissions. Use .tar.xz" ;;
(*.lzma) print "${0}: .lzma is only useful for single files, and does not capture permissions. Use .tar.lzma" ;;
(*) print "${0}: unknown archive type: ${archive_name}" ;;
esac
Reference in a new issue Copy permalink