f02e732543872814adb52439fbfff3e247cc49d0

Author
Robby Russell <robby@planetargon.com>
Committer
Robby Russell <robby@planetargon.com>
Date

Message

Merge branch 'master' of https://github.com/SuprDewd/oh-my-zsh into SuprDewd-master

Diff

 1diff --git a/lib/aliases.zsh b/lib/aliases.zsh
 2index d2d3aed811f08191cab9c012de2284e4f32b8354..b47de5bde5a573e4c9465048111c133b3213edc3 100644
 3--- a/lib/aliases.zsh
 4+++ b/lib/aliases.zsh
 5@@ -21,3 +21,5 @@ alias ll='ls -l'
 6 alias sl=ls # often screw this up
 7 
 8 alias afind='ack-grep -il'
 9+
10+alias x=extract
11diff --git a/lib/functions.zsh b/lib/functions.zsh
12index e3c0de43ed8852c672b877177898f27f52af2a02..914f2ef25a22d141cfd2e8c9c6255e535641274b 100644
13--- a/lib/functions.zsh
14+++ b/lib/functions.zsh
15@@ -37,3 +37,39 @@ function take() {
16   mkdir -p $1
17   cd $1
18 }
19+
20+function extract() {
21+    unset REMOVE_ARCHIVE
22+    
23+    if test "$1" = "-r"; then
24+        REMOVE=1
25+        shift
26+    fi
27+  if [[ -f $1 ]]; then
28+    case $1 in
29+      *.tar.bz2) tar xvjf $1;;
30+      *.tar.gz) tar xvzf $1;;
31+      *.tar.xz) tar xvJf $1;;
32+      *.tar.lzma) tar --lzma -xvf $1;;
33+      *.bz2) bunzip $1;;
34+      *.rar) unrar $1;;
35+      *.gz) gunzip $1;;
36+      *.tar) tar xvf $1;;
37+      *.tbz2) tar xvjf $1;;
38+      *.tgz) tar xvzf $1;;
39+      *.zip) unzip $1;;
40+      *.Z) uncompress $1;;
41+      *.7z) 7z x $1;;
42+      *) echo "'$1' cannot be extracted via >extract<";;
43+    esac
44+
45+    if [[ $REMOVE_ARCHIVE -eq 1 ]]; then
46+        echo removing "$1";
47+        /bin/rm "$1";
48+    fi
49+
50+  else
51+    echo "'$1' is not a valid file"
52+  fi
53+}
54+