bin/unarchive: simplify + refactor

This commit is contained in:
Henrik Lissner 2016-11-15 14:23:39 +01:00
parent 40fc44f01f
commit a0a9a5b871

View file

@ -1,34 +1,14 @@
#
#!/usr/bin/env bash
# Extracts the contents of archives.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
#
local remove_archive
local success
local file_name
local extract_dir
if (( $# == 0 )); then
cat >&2 <<EOF
usage: $0 [-option] [file ...]
options:
-r, --remove remove archive
Report bugs to <sorin.ionescu@gmail.com>.
EOF
fi
remove_archive=1
if [[ "$1" == "-r" || "$1" == "--remove" ]]; then
remove_archive=0
shift
fi
# Adapted from a script by Sorin Ionescu <sorin.ionescu@gmail.com>
success=
file_name=
extract_dir=
while (( $# > 0 )); do
if [[ ! -s "$1" ]]; then
if [[ ! -s $1 ]]; then
print "$0: file not valid: $1" >&2
shift
continue
@ -37,27 +17,27 @@ while (( $# > 0 )); do
success=0
file_name="${1:t}"
extract_dir="${file_name:r}"
case "$1:l" in
(*.tar.gz|*.tgz) tar xvzf "$1" ;;
(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \
case ${1:l} in
*.tar.gz|*.tgz) tar xvzf "$1" ;;
*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
*.tar.xz|*.txz) tar --xz --help &> /dev/null \
&& tar --xz -xvf "$1" \
|| xzcat "$1" | tar xvf - ;;
(*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
*.tar.zma|*.tlz) tar --lzma --help &> /dev/null \
&& tar --lzma -xvf "$1" \
|| lzcat "$1" | tar xvf - ;;
(*.tar) tar xvf "$1" ;;
(*.gz) gunzip "$1" ;;
(*.bz2) bunzip2 "$1" ;;
(*.xz) unxz "$1" ;;
(*.lzma) unlzma "$1" ;;
(*.Z) uncompress "$1" ;;
(*.zip) unzip "$1" -d $extract_dir ;;
(*.rar) unrar &> /dev/null \
*.tar) tar xvf "$1" ;;
*.gz) gunzip "$1" ;;
*.bz2) bunzip2 "$1" ;;
*.xz) unxz "$1" ;;
*.lzma) unlzma "$1" ;;
*.Z) uncompress "$1" ;;
*.zip) unzip "$1" -d $extract_dir ;;
*.rar) unrar &> /dev/null \
&& unrar x -ad "$1" \
|| rar x -ad "$1" ;;
(*.7z) 7za x "$1" ;;
(*.deb)
*.7z) 7za x "$1" ;;
*.deb)
mkdir -p "$extract_dir/control"
mkdir -p "$extract_dir/data"
cd "$extract_dir"; ar vx "../${1}" > /dev/null
@ -66,13 +46,9 @@ while (( $# > 0 )); do
cd ..; rm *.tar.gz debian-binary
cd ..
;;
(*)
print "$0: cannot extract: $1" >&2
*) print "$0: cannot extract: $1" >&2
success=1
;;
esac
(( success = $success > 0 ? $success : $? ))
(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
shift
done