handle more files, simply removing function ver

[small-misc-bash] / ex

diff --git a/ex b/ex
old mode 100755 (executable)
new mode 100644 (file)
index 5ca021e..44bb462
--- a/ex
+++ b/ex
@@ -23,37 +23,35 @@ See source for exact file extensions."
     fi
     local x super
     for x in "$@"; do
-       case "$x" in
-           *.tar.bz2 | *.tbz2 ) tar xvjf "$x" ;;
-           *.tar.gz | *.tgz ) tar xvzf "$x" ;;
-           *.bz2 ) bunzip2 "$x" ;;
-           *.gz ) gunzip  "$x" ;;
-           *.tar ) tar xvf "$x" ;;
-           *.zip ) unzip "$x" ;;
-           *.Z ) uncompress "$x" ;;
-           *.7z ) 7za x "$x" ;;
-           *.deb ) ar xv "$x" ;;
-            *.rpm ) rpm2cpio "$x" | cpio --extract --make-directories --verbose ;;
-           *.tar.xz ) tar Jxvf "$x" ;;
+        case "$x" in
+            *.tar.bz2 | *.tbz2 ) tar xjf "$x" ;;
+            *.tar.gz | *.tgz ) tar xzf "$x" ;;
+            *.bz2 ) bunzip2 "$x" ;;
+            *.gz ) gunzip  "$x" ;;
+            *.tar ) tar xf "$x" ;;
+            *.zip ) unzip "$x" ;;
+            *.Z ) uncompress "$x" ;;
+            *.7z ) 7za x "$x" ;;
+            *.deb ) ar x "$x" ;;
+            *.rpm ) rpm2cpio "$x" | cpio --extract --make-directories ;;
+            *.tar.xz ) tar Jxf "$x" ;;
+            *.xz) xz -d "$x" ;;
             *.iso )
+                local super
                 if [[ $EUID != 0 ]]; then
-                    if [[ $(sudo -v) == Sorry* ]]; then
-                        echo error: need superuser priveledge for iso file
-                        return 1
-                    fi
                     super=sudo
                 fi
                 local temp_dir=$(mktemp -d)
-                losetup -f
+                $super losetup -f
                 $super mount -o loop "$x" "$temp_dir"
                 local dir="${x%%.iso}"
                 mkdir "$dir"
-                cp -av "$temp_dir"/* "$dir"
+                cp -a "$temp_dir"/* "$dir"
                 $super umount "$temp_dir"
                 ;;
             *.r[0-9][0-9]|*.rar ) unrar x "$x" ;;
-           *)  echo "I don't kno how to extract $x";;
-       esac
+            *)  echo "I don't kno how to extract $x";;
+        esac
     done
 }
 ex "$@"