Merge branch 'master' of majnematic.com:davesdots

This commit is contained in:
David Majnemer 2010-07-01 13:06:57 -07:00
commit d1caf979a0
2 changed files with 46 additions and 37 deletions

View file

@ -90,42 +90,27 @@ extract ()
*.tar) *.tar)
tar xf "${1}" tar xf "${1}"
;; ;;
*.gz|*.z) *.tar.bz2|*.tbz2|*.tbz)
gzip -dc "${1}" > `basename "${1%.*}"` bzip2 -dc "${1}" | tar xf -
;; ;;
*.tar.gz|*.tgz|*.tz) *.tar.gz|*.tgz|*.tz)
gzip -dc "${1}" | tar xf - gzip -dc "${1}" | tar xf -
;; ;;
*.Z) *.tar.lzma|*.tlz)
uncompress -c "${1}" > `basename "${1%.*}"` lzma -dc "${1}" | tar xf -
;;
*.tar.xz|*.txz)
xz -dc "${1}" | tar xf -
;; ;;
*.tar.z|*.tar.Z|*.taz) *.tar.z|*.tar.Z|*.taz)
uncompress -c "${1}" | tar xf - uncompress -c "${1}" | tar xf -
;; ;;
*.bz2|*.bz)
bzip2 -dc "${1}" > `basename "${1%.*}"`
;;
*.tar.bz2|*.tbz2|*.tbz)
bzip2 -dc "${1}" | tar xf -
;;
*.7z)
7zr x "${1}"
;;
*.tar.7z|*.t7z) *.tar.7z|*.t7z)
7zr x -so "${1}" | tar xf - 7zr x -so "${1}" | tar xf -
;; ;;
*.lzma) *.lzma)
lzma -dc "${1}" > `basename "${1%.*}"` lzma -dc "${1}" > `basename "${1%.*}"`
;; ;;
*.tar.lzma|*.tlz)
lzma -dc "${1}" | tar xf -
;;
*.xz)
xz -dc "${1}" > `basename "${1%.*}"`
;;
*.tar.xz|*.txz)
xz -dc "${1}" | tar xf -
;;
*.a|*.deb) *.a|*.deb)
ar x "${1}" ar x "${1}"
;; ;;
@ -144,6 +129,12 @@ extract ()
*.lha|*.lzh) *.lha|*.lzh)
lha xqf "${1}" lha xqf "${1}"
;; ;;
*.pax)
pax -rf "${1}"
;;
*.pax.bz2)
bzip2 -dc "${1}" | pax -rf -
;;
*.rar) *.rar)
unrar x -idq "${1}" unrar x -idq "${1}"
;; ;;
@ -156,6 +147,21 @@ extract ()
*.zoo) *.zoo)
zoo x "${1}" zoo x "${1}"
;; ;;
*.bz2|*.bz)
bzip2 -dc "${1}" > `basename "${1%.*}"`
;;
*.gz|*.z)
gzip -dc "${1}" > `basename "${1%.*}"`
;;
*.xz)
xz -dc "${1}" > `basename "${1%.*}"`
;;
*.Z)
uncompress -c "${1}" > `basename "${1%.*}"`
;;
*.7z)
7zr x "${1}"
;;
*) *)
echo "Unable to extract '"$1"'" echo "Unable to extract '"$1"'"
return 1 return 1

25
vimrc
View file

@ -109,7 +109,7 @@ endif
set laststatus=2 set laststatus=2
set shortmess=atI set shortmess=atI
if has('statusline') if has('statusline')
set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %c\ (%P) set statusline=%<%F\ %r[%{&ff}]%y%m\ %=\ Line\ %l\/%L\ Col:\ %v\ (%P)
endif endif
" Enable modelines only on secure vim " Enable modelines only on secure vim
@ -300,6 +300,9 @@ map! <C-a> <Home>
map <C-a> <Home> map <C-a> <Home>
map! <C-e> <End> map! <C-e> <End>
map <C-e> <End> map <C-e> <End>
imap <C-f> <Right>
imap <C-b> <Left>
map! <M-BS> <C-w>
map <C-k> d$ map <C-k> d$
if has('eval') if has('eval')
inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR> inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
@ -326,8 +329,8 @@ map! <C-h> <BS>
if (&term =~ "interix") if (&term =~ "interix")
map <C-?> <DEL> map <C-?> <DEL>
map! <C-?> <DEL> map! <C-?> <DEL>
map  <Home> map <C-[>[H <Home>
map  <End> map <C-[>[U <End>
elseif (&term =~ "^sun") elseif (&term =~ "^sun")
map <C-?> <DEL> map <C-?> <DEL>
map! <C-?> <DEL> map! <C-?> <DEL>
@ -337,14 +340,14 @@ elseif (&term !~ "cons")
endif endif
if (&term =~ "^xterm") if (&term =~ "^xterm")
map  <Home> map <C-[>[H <Home>
map!  <Home> map! <C-[>[H <Home>
map  <End> map <C-[>[F <End>
map!  <End> map! <C-[>[F <End>
map  <C-Left> map <C-[>[5D <C-Left>
map!  <C-Left> map! <C-[>[5D <C-Left>
map  <C-Right> map <C-[>[5C <C-Right>
map!  <C-Right> map! <C-[>[5C <C-Right>
endif endif
" Python specific stuff " Python specific stuff