Merge branch 'master' of git://majnematic.com/davesdots

commonsh/10_utility

@@ -51,41 +51,71 @@ extract ()
       *.tar)
          tar xf "${1}"
       ;;
-      *.tar.gz|*.tgz)
-         gunzip -c "${1}" | tar xf -
-      ;;
-      *.tar.z)
-         uncompress -c "${1}" | tar xf -
-      ;;
-      *.tar.bz2|*.tbz2|*.tbz)
-         bzcat "${1}" | tar xf -
-      ;;
-      *.zip|*.jar)
-         unzip -qo "${1}"
-      ;;
       *.gz|*.z)
          gzip -dc "${1}" > `basename "${1%.*}"`
       ;;
-      *.bz2)
+      *.tar.gz|*.tgz|*.tz)
+         gzip -dc "${1}" | tar xf -
+      ;;
+      *.Z)
+         uncompress -c "${1}" > `basename "${1%.*}"`
+      ;;
+      *.tar.z|*.tar.Z|*.taz)
+         uncompress -c "${1}" | tar xf -
+      ;;
+      *.bz2|*.bz)
          bzip2 -dc "${1}" > `basename "${1%.*}"`
       ;;
-      *.rar)
+      *.tar.bz2|*.tbz2|*.tbz)
-         unrar x -idq "${1}"
+         bzip2 -dc "${1}" | tar xf -
       ;;
-      *.lha|*.lzh)
+      *.7z)
-         lha xqf "${1}"
+         7zr x "${1}"
       ;;
-      *.a|*.deb)
+      *.tar.7z|*.t7z)
-         ar x "${1}"
+         7zr x -so "${1}" | tar xf -
-      ;;
-      *.tar.lzma)
-         lzma -dc "${1}" | tar xf
       ;;
       *.lzma)
          lzma -dc "${1}" > `basename "${1%.*}"`
       ;;
-      *.7z)
+      *.tar.lzma|*.tlz)
-         7zr x "${1}"
+         lzma -dc "${1}" | tar xf -
+      ;;
+      *.xz)
+         xz -dc "${1}" > `basename "${1%.*}"`
+      ;;
+      *.tar.xz|*.txz)
+         xz -dc "${1}" | tar xf -
+      ;;
+      *.a|*.deb)
+         ar x "${1}"
+      ;;
+      *.ace)
+         unace x "${1}"
+      ;;
+      *.arj)
+         arj x "${1}"
+      ;;
+      *.cpio)
+         cpio -id < "${1}"
+      ;;
+      *.rpm)
+         rpm2cpio "${1}" | cpio -id
+      ;;
+      *.lha|*.lzh)
+         lha xqf "${1}"
+      ;;
+      *.rar)
+         unrar x -idq "${1}"
+      ;;
+      *.rz)
+         rzip -d -f -k "${1}"
+      ;;
+      *.zip|*.jar)
+         unzip -qo "${1}"
+      ;;
+      *.zoo)
+         zoo x "${1}"
       ;;
       *)
          echo "Unable to extract '"$1"'"

zsh/utility

@@ -1,6 +1,6 @@
 # utility.sh
 # Miscellaneous Utility Functions
 
-zstyle ':completion:*:*:extract:*' file-patterns '*.(tar|tar.gz|tgz|tar.Z|tar.bz2|tbz2|zip|ZIP|jar|gz|Z|z|bz2|rar|RAR|LHa|LHA|lha|lzh|a|deb|tar.lzma|lzma|7z):Compressed\ Files *(-/):directories'
+zstyle ':completion:*:*:extract:*' file-patterns '*.(tar|tar.gz|tgz|tz|tar.Z|tar.z|taz|tar.bz2|tbz2|tbz|zip|ZIP|jar|gz|Z|z|bz2|bz|rar|RAR|rz|zoo|LHa|LHA|lha|lzh|a|deb|tar.lzma|lzma|tlz|7z|tar.7z|t7z|xz|txz|tar.xz|ace|arj|cpio|rpm):Compressed\ Files *(-/):directories'
 
 # vim: set ft=sh ts=3 sw=3 et: