extract: fix styling

plugins/extract/_extract

@@ -4,5 +4,3 @@
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
   "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|ipsw|rar|7z|deb)(-.)'" && return 0
-
-

plugins/extract/extract.plugin.zsh

@@ -1,24 +1,18 @@
-# ------------------------------------------------------------------------------
-#          FILE:  extract.plugin.zsh
-#   DESCRIPTION:  oh-my-zsh plugin file.
-#        AUTHOR:  Sorin Ionescu (sorin.ionescu@gmail.com)
-#       VERSION:  1.0.1
-# ------------------------------------------------------------------------------
-
+alias x=extract
 
-function extract() {
+extract() {
 	local remove_archive
 	local success
 	local file_name
 	local extract_dir
 
 	if (( $# == 0 )); then
-    echo "Usage: extract [-option] [file ...]"
-    echo
-    echo Options:
-    echo "    -r, --remove    Remove archive."
-    echo
-    echo "Report bugs to <sorin.ionescu@gmail.com>."
+		cat <<-'EOF' >&2
+			Usage: extract [-option] [file ...]
+
+			Options:
+			    -r, --remove    Remove archive.
+		EOF
 	fi
 
 	remove_archive=1
@@ -29,7 +23,7 @@ function extract() {
 
 	while (( $# > 0 )); do
 		if [[ ! -f "$1" ]]; then
-      echo "extract: '$1' is not a valid file" 1>&2
+			echo "extract: '$1' is not a valid file" >&2
 			shift
 			continue
 		fi
@@ -38,16 +32,18 @@ function extract() {
 		file_name="$( basename "$1" )"
 		extract_dir="$( echo "$file_name" | sed "s/\.${1##*.}//g" )"
 		case "$1" in
-      (*.tar.gz|*.tgz) [ -z $commands[pigz] ] && tar zxvf "$1" || pigz -dc "$1" | tar xv ;;
+			(*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$1" | tar xv } || tar zxvf "$1" ;;
 			(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
-      (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
+			(*.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) [ -z $commands[pigz] ] && gunzip "$1" || pigz -d "$1" ;;
+			(*.gz) (( $+commands[pigz] )) && pigz -d "$1" || gunzip "$1" ;;
 			(*.bz2) bunzip2 "$1" ;;
 			(*.xz) unxz "$1" ;;
 			(*.lzma) unlzma "$1" ;;
@@ -65,7 +61,7 @@ function extract() {
 				cd ..
 			;;
 			(*)
-        echo "extract: '$1' cannot be extracted" 1>&2
+				echo "extract: '$1' cannot be extracted" >&2
 				success=1
 			;;
 		esac
@@ -75,6 +71,3 @@ function extract() {
 		shift
 	done
 }
-
-alias x=extract
-