Permalink
Browse files

bunch of updates... w/ todo script

  • Loading branch information...
1 parent c995979 commit 2e1cd2f1aab9e3c098bf99724ae8ce86a2fd9f50 DeShawn Williams committed Feb 28, 2012
Showing with 7,047 additions and 196 deletions.
  1. +41 −45 conf/bash/bash_aliases
  2. +2 −133 conf/bash/bash_profile
  3. +144 −3 conf/bash/bashrc
  4. +76 −12 conf/tmux/tmux.conf
  5. +55 −0 conf/tmux/work.conf
  6. +4 −2 conf/vim/vimrc
  7. +1 −1 scripts/has_it_been_a_while.sh
  8. +3 −0 scripts/todo/.gitignore
  9. +38 −0 scripts/todo/GEN-VERSION-FILE
  10. +674 −0 scripts/todo/LICENSE
  11. +52 −0 scripts/todo/Makefile
  12. +27 −0 scripts/todo/README.textile
  13. 0 scripts/todo/done.txt
  14. 0 scripts/todo/report.txt
  15. +2 −0 scripts/todo/tests/Makefile
  16. +258 −0 scripts/todo/tests/README
  17. +87 −0 scripts/todo/tests/aggregate-results.sh
  18. +70 −0 scripts/todo/tests/t0000-config.sh
  19. +103 −0 scripts/todo/tests/t0001-null.sh
  20. +40 −0 scripts/todo/tests/t0002-actions.sh
  21. +16 −0 scripts/todo/tests/t0100-code-nobacktick.sh
  22. +113 −0 scripts/todo/tests/t1000-addlist.sh
  23. +89 −0 scripts/todo/tests/t1010-add-date.sh
  24. +101 −0 scripts/todo/tests/t1020-addtolistfile.sh
  25. +75 −0 scripts/todo/tests/t1030-addto-date.sh
  26. +167 −0 scripts/todo/tests/t1100-replace.sh
  27. +103 −0 scripts/todo/tests/t1200-pri.sh
  28. +131 −0 scripts/todo/tests/t1250-listpri.sh
  29. +42 −0 scripts/todo/tests/t1260-listprj.sh
  30. +733 −0 scripts/todo/tests/t1300-ls.sh
  31. +58 −0 scripts/todo/tests/t1310-listcon.sh
  32. +58 −0 scripts/todo/tests/t1320-listproj.sh
  33. +185 −0 scripts/todo/tests/t1330-ls-highlighting.sh
  34. +65 −0 scripts/todo/tests/t1340-listescapes.sh
  35. +150 −0 scripts/todo/tests/t1350-listall.sh
  36. +122 −0 scripts/todo/tests/t1400-prepend.sh
  37. +86 −0 scripts/todo/tests/t1500-do.sh
  38. +103 −0 scripts/todo/tests/t1600-append.sh
  39. +97 −0 scripts/todo/tests/t1700-depri.sh
  40. +153 −0 scripts/todo/tests/t1800-del.sh
  41. +35 −0 scripts/todo/tests/t1900-archive.sh
  42. +103 −0 scripts/todo/tests/t1910-deduplicate.sh
  43. +96 −0 scripts/todo/tests/t1950-report.sh
  44. +136 −0 scripts/todo/tests/t2000-multiline.sh
  45. +57 −0 scripts/todo/tests/t8000-actions.sh
  46. +167 −0 scripts/todo/tests/t9999-testsuite_example.sh
  47. +664 −0 scripts/todo/tests/test-lib.sh
  48. +6 −0 scripts/todo/tests/testshell.sh
  49. 0 scripts/todo/todo
  50. +79 −0 scripts/todo/todo.cfg
  51. +1,300 −0 scripts/todo/todo.sh
  52. +1 −0 scripts/todo/todo.txt
  53. +79 −0 scripts/todo/todo_completion
View
@@ -1,16 +1,5 @@
-# RANDOM CONSTANTS
-WORKUNAME='dalopez'
-CUSTOM_BUILD_DIR='~/programs'
-CUSTOM_BUILD_BIN_DIR='bin'
-
-# Detect platform for platform conditionals
-platform='unknown'
-unamestr=`uname`
-if [[ "$unamestr" == 'Linux' ]]; then
- platform='linux'
-elif [[ "$unamestr" == 'Darwin' ]]; then
- platform='darwin'
-fi
+# colored directory listings etc
+ #dircolors=~/env/conf/bash/dircolors-$(tput colors)
if [[ $platform == 'linux' ]]; then
# SPECIFIC TO LINUX MACHINES
@@ -31,31 +20,47 @@ elif [[ $platform == 'darwin' ]]; then
alias ff6="/Applications/Firefox6.app/Contents/MacOS/firefox-bin -no-remote -P 'firefox6' &"
# OSX - (clears DNS on mac machine)
alias flushdns="dscacheutil -flushcache"
+fi
+if [ -f $dircolors ]; then
+ eval $(dircolors -b $dircolors)
+ if [[ $platform == 'darwin' ]]; then
+ alias ls='gls --color=auto'
+ else
+ alias ls='ls --color=auto'
+ fi;
+ alias grep='grep --color=auto'
+ alias fgrep='fgrep --color=auto'
+ alias egrep='egrep --color=auto'
+else
+ eval $(dircolors)
fi
+# and now on to the sane stuff.... kinda.......................................
+
# Programs
alias rhino="java -jar ~/programs/rhino/js.jar"
-# Handy unix stuff
+# Handy utilities
# count files in directory (recursive)
alias count_files='find . -type f | wc -l'
alias rmcvs="find . -depth -name 'CVS' -exec rm -rf '{}' \; -print"
alias rmsvn='find . -name .svn -print0 | xargs -0 rm -rf'
# outputs /bin directories bash is reading from
alias paths='echo -e ${PATH//:/\\n}'
- # copies Samuel L Jackson Ipsum to clipboard
- alias sam='less ~/SamuelIpsum.txt | pbcopy'
+ alias ipsum='cat ~/ipsum.txt | pbcopy'
# General Shorcuts
alias s="sudo"
alias ss="s !!"
+
#Lazy ass aliases
alias c="clear"
alias b="cd .."
+ # use gnu ls instead of mac... with colors
if [[ $platform == 'darwin' ]]; then
alias l="gls -l --color=auto"
alias la='gls -la --color=auto'
@@ -75,8 +80,15 @@ fi
alias gco='git co'
# Editor aliases
-alias gvim='~/env/scripts/vim/mvim'
-alias sgvim='sudo ~/env/scripts/vim/mvim'
+if [[ $platform == 'darwin' ]]; then
+ alias vim='reattach-to-user-namespace vim' # reattach is for clipboard funnyness
+fi
+
+if [[ $platform == 'darwin' ]]; then
+ alias gvim='~/env/scripts/vim/mvim'
+ alias sgvim='sudo ~/env/scripts/vim/mvim'
+fi
+
alias ed=vim
# Misc Scripts
@@ -98,11 +110,11 @@ alias drush='~/env/scripts/drush/drush'
alias apx="ap stop"
alias aps="ap start"
# edit main apache configuration file
- alias apc="sgvim /etc/apache2/httpd.conf"
+ alias apc="ed /etc/apache2/httpd.conf"
alias apl="tail -f /Applications/MAMP/logs/apache_error.log"
- alias vac="sgvim /usr/local/etc/varnish/default.vcl"
+ alias vac="ed /usr/local/etc/varnish/default.vcl"
alias vas="varnishd -f /usr/local/etc/varnish/default.vcl -s malloc,1G -T 127.0.0.1:2000 -a 0.0.0.0:1702"
- alias ngc="sgvim vim /usr/local/etc/nginx/nginx.conf"
+ alias ngc="ed vim /usr/local/etc/nginx/nginx.conf"
alias ngs="sudo nginx"
alias ngx="sudo nginx -s stop"
@@ -113,17 +125,17 @@ alias drush='~/env/scripts/drush/drush'
alias mysqlx='sudo mysql.server stop'
# edit host configuration (just 777'd host file.)
- alias ehosts="sgvim /etc/hosts"
- alias ehost="sgvim /etc/hosts"
- alias eh="gvim /etc/hosts"
+ alias ehosts="ed /etc/hosts"
+ alias ehost="ed /etc/hosts"
+ alias eh="ed /etc/hosts"
# edit gvim rc
alias gvimrc="gvim ~/.gvimrc.local"
# edit vimrc
- alias vrc="gvim ~/.vimrc"
+ alias vrc="ed ~/.vimrc"
# edit bash profile
- alias brc="gvim ~/.bash_profile && bash --rcfile ~/.bash_profile"
+ alias brc="ed ~/.bash_profile && bash --rcfile ~/.bash_profile"
# edit bash aliases
- alias bal="gvim ~/.bash_aliases && bash --rcfile ~/.bash_profile"
+ alias bal="ed ~/.bash_aliases && bash --rcfile ~/.bash_profile"
# reload bash configurations
alias brl='bash --rcfile ~/.bash_profile'
@@ -159,23 +171,7 @@ alias drush='~/env/scripts/drush/drush'
alias bafi='cd ~/sites/drupal/sites/all/modules/baffin_component/includes/'
alias zom='cd ~/sites/drupal/sites/all/modules/utils/zommons/'
-# colored directory listings etc
- dircolors=~/env/conf/bash/dircolors-$(tput colors)
-
- if [ -f $dircolors ]; then
- eval $(dircolors -b $dircolors)
- if [[ $platform == 'darwin' ]]; then
- alias ls='gls --color=auto'
- else
- alias ls='ls --color=auto'
- fi;
- alias grep='grep --color=auto'
- alias fgrep='fgrep --color=auto'
- alias egrep='egrep --color=auto'
- else
- eval $(dircolors)
- fi
-
+# Server login aliases
alias devjump='ssh dalopez@devjump.zappos.net'
-
alias prelive='ssh dalopez@new-prelive.zappos.net'
+
View
@@ -1,136 +1,5 @@
# Source global definitions
-if [ -f /etc/bashrc ]; then
- . /etc/bashrc
+if [[ -f /etc/bashrc ]]; then
+ source ~/.bashrc
fi
-export ENV_NAME=`cat ~/env/var/env_name`
-
-export TERM='xterm-256color'
-
-# Load custom environment variables
-if [ -e ~/env/conf/bash/bash_env ]; then . ~/env/conf/bash/bash_env; fi
-
-# Load .bash_aliases
-if [ -e ~/.bash_aliases ]; then . ~/.bash_aliases; fi
-
-# PS1... W0rd
-PS1='\[\e[38;5;120m\]$PWD\[\e[m\] \[\e[1;34m\]- ($ENV_NAME) $(__git_ps1 "(%s)")\[\e[m\]
-=>\[\e[m\]'
-
-# Git auto completion
-source ~/env/scripts/git/git-completion.bash
-
-#------------------------------------------------------------------------------
-# Functions / Complex aliases
-#------------------------------------------------------------------------------
-
-# Change the title of the current tab
-t(){
- echo -ne "\e]2;$*\a"
-}
-
-# Search through process list
-psf() {
- if [ ! -z $1 ] ; then
- echo "Grepping for processes matching $1..."
- ps aux | grep $1 | grep -v grep
- else
- echo "!! Need name to grep for"
- fi
-}
-
-# Run a custom script
-rs() {
- php ~/env/scripts/script.php "$@";
-}
-
-# Run a site command
-site() {
- php ~/env/scripts/site/site.php "$@";
-}
-
-# Find a file with a pattern in name:
-function ff() {
- find . -type f -iname '*'$*'*' -ls ;
-}
-
-# Find a file with a pattern in name:
-function f() {
- ff "$*" | awk '{FS = " " ; print $11}'
-}
-
-# Find a pattern in a set of files and highlight them:
-function fstr() {
- OPTIND=1
- local case=""
- local usage="fstr: find string in files. Usage: fstr [-i] \"pattern\" [\"filename pattern\"] "
- while getopts :it opt
- do
- case "$opt" in
- i) case="-i " ;;
- *) echo "$usage"; return;;
- esac
- done
- shift $(( $OPTIND - 1 ))
- if [ "$#" -lt 1 ]; then
- echo "$usage"
- return;
- fi
- find . -type f -name "${2:-*}" -print0 | xargs -0 egrep -sn ${case} "$1" 2>&- | more
-
-}
-
-alias fs=fstr
-
-# Extract a compressed archive
-function extract() {
- if [ -f $1 ] ; then
- case $1 in
- *.tar.bz2) tar xvjf $1 ;;
- *.tar.gz) tar xvzf $1 ;;
- *.bz2) bunzip2 $1 ;;
- *.rar) unrar x $1 ;;
- *.gz) gunzip $1 ;;
- *.tar) tar xvf $1 ;;
- *.tbz2) tar xvjf $1 ;;
- *.tgz) tar xvzf $1 ;;
- *.zip) unzip $1 ;;
- *.Z) uncompress $1 ;;
- *.7z) 7z x $1 ;;
- *) echo "'$1' cannot be extracted via >extract<" ;;
- esac
- else
- echo "'$1' is not a valid file"
- fi
-}
-
-# Find ip address
-function ipaddr() {
- echo $(/sbin/ifconfig | awk '/inet addr:/ { print $2 }' | sed -e 's/addr://' | sed -e 's/127.0.0.1//')
-}
-
-# Make a directory and go into it
-function mk() {
- mkdir $1
- cd $1
-}
-
-# Function to load a screen profile
-sp() {
- if [[ -f "$HOME/env/conf/screen/$1" ]]; then
- screen -c "$HOME/env/conf/screen/$1"
- else
- screen -c "$HOME/env/conf/screen/screenrc"
- fi
-}
-
-
-#MACHINE SPECIFIC
-#PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin:/usr/local/git/bin:/opt/local/bin
-#PATH=/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/X11/bin:/Users/dal/scripts:/Users/dal/scripts/drush:/usr/local/sbin
-
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" # Load RVM function
-
-source $HOME/env/scripts/startup.sh
-
-source ~/fez-scripts/fez-scripts.bashrc
Oops, something went wrong.

0 comments on commit 2e1cd2f

Please sign in to comment.