Unverified Commit 0b32e4b2 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

style(extract): adopt main code style guide and refactor variables

parent 10a00085
...@@ -3,20 +3,16 @@ alias x=extract ...@@ -3,20 +3,16 @@ alias x=extract
extract() { extract() {
setopt localoptions noautopushd setopt localoptions noautopushd
local remove_archive
local success
local extract_dir
if (( $# == 0 )); then if (( $# == 0 )); then
cat <<-'EOF' >&2 cat >&2 <<'EOF'
Usage: extract [-option] [file ...] Usage: extract [-option] [file ...]
Options: Options:
-r, --remove Remove archive after unpacking. -r, --remove Remove archive after unpacking.
EOF EOF
fi fi
remove_archive=1 local remove_archive=1
if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then
remove_archive=0 remove_archive=0
shift shift
...@@ -30,54 +26,53 @@ extract() { ...@@ -30,54 +26,53 @@ extract() {
continue continue
fi fi
success=0 local success=0
extract_dir="${1:t:r}" local extract_dir="${1:t:r}"
local full_path="${1:A}" local file="$1" full_path="${1:A}"
case "${1:l}" in case "${file:l}" in
(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;; (*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$file" | tar xv } || tar zxvf "$file" ;;
(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;; (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$file" ;;
(*.tar.xz|*.txz) (*.tar.xz|*.txz)
tar --xz --help &> /dev/null \ tar --xz --help &> /dev/null \
&& tar --xz -xvf "$1" \ && tar --xz -xvf "$file" \
|| xzcat "$1" | tar xvf - ;; || xzcat "$file" | tar xvf - ;;
(*.tar.zma|*.tlz) (*.tar.zma|*.tlz)
tar --lzma --help &> /dev/null \ tar --lzma --help &> /dev/null \
&& tar --lzma -xvf "$1" \ && tar --lzma -xvf "$file" \
|| lzcat "$1" | tar xvf - ;; || lzcat "$file" | tar xvf - ;;
(*.tar.zst|*.tzst) (*.tar.zst|*.tzst)
tar --zstd --help &> /dev/null \ tar --zstd --help &> /dev/null \
&& tar --zstd -xvf "$1" \ && tar --zstd -xvf "$file" \
|| zstdcat "$1" | tar xvf - ;; || zstdcat "$file" | tar xvf - ;;
(*.tar) tar xvf "$1" ;; (*.tar) tar xvf "$file" ;;
(*.tar.lz) (( $+commands[lzip] )) && tar xvf "$1" ;; (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
(*.tar.lz4) lz4 -c -d "$1" | tar xvf - ;; (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
(*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$1" ;; (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
(*.gz) (( $+commands[pigz] )) && pigz -dk "$1" || gunzip -k "$1" ;; (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
(*.bz2) bunzip2 "$1" ;; (*.bz2) bunzip2 "$file" ;;
(*.xz) unxz "$1" ;; (*.xz) unxz "$file" ;;
(*.lrz) (( $+commands[lrunzip] )) && lrunzip "$1" ;; (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
(*.lz4) lz4 -d "$1" ;; (*.lz4) lz4 -d "$file" ;;
(*.lzma) unlzma "$1" ;; (*.lzma) unlzma "$file" ;;
(*.z) uncompress "$1" ;; (*.z) uncompress "$file" ;;
(*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$1" -d "$extract_dir" ;; (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
(*.rar) unrar x -ad "$1" ;; (*.rar) unrar x -ad "$file" ;;
(*.rpm) (*.rpm)
command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \ command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
&& rpm2cpio "$full_path" | cpio --quiet -id ;; && rpm2cpio "$full_path" | cpio --quiet -id ;;
(*.7z) 7za x "$1" ;; (*.7z) 7za x "$file" ;;
(*.deb) (*.deb)
command mkdir -p "$extract_dir/control" "$extract_dir/data" command mkdir -p "$extract_dir/control" "$extract_dir/data"
builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
builtin cd -q control; extract ../control.tar.* builtin cd -q control; extract ../control.tar.*
builtin cd -q ../data; extract ../data.tar.* builtin cd -q ../data; extract ../data.tar.*
builtin cd -q ..; command rm *.tar.* debian-binary ;; builtin cd -q ..; command rm *.tar.* debian-binary ;;
(*.zst) unzstd "$1" ;; (*.zst) unzstd "$file" ;;
(*.cab) cabextract -d "$extract_dir" "$1" ;; (*.cab) cabextract -d "$extract_dir" "$file" ;;
(*.cpio) cpio -idmvF "$1" ;; (*.cpio) cpio -idmvF "$file" ;;
(*) (*)
echo "extract: '$1' cannot be extracted" >&2 echo "extract: '$file' cannot be extracted" >&2
success=1 success=1 ;;
;;
esac esac
(( success = success > 0 ? success : $? )) (( success = success > 0 ? success : $? ))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment