Merge be647ff448 into eca3498f46

aliases/available/general.aliases.bash

@@ -21,7 +21,7 @@ then
   alias shuf=gshuf
 fi
 
-alias c='clear'
+#alias c='clear'
 alias k='clear'
 alias cls='clear'
 

aliases/available/git.aliases.bash

@@ -36,6 +36,7 @@ alias gg="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %
 alias ggs="gg --stat"
 alias gsl="git shortlog -sn"
 alias gw="git whatchanged"
+alias git-sign-off='git filter-branch -f --msg-filter "cat && echo \"Signed-off-by: Mike Turquette <mturquette@linaro.org>\""'
 
 if [ -z "$EDITOR" ]; then
     case $OSTYPE in
@@ -50,5 +51,11 @@ if [ -z "$EDITOR" ]; then
         ;;
     esac
 else
+    case $EDITOR in
+      *vim*)
+        alias gd="git diff | $EDITOR -R -"
+        ;;
+      *)
         alias gd="git diff | $EDITOR"
+    esac
 fi

aliases/available/tmux.aliases.bash

@@ -0,0 +1,4 @@
+cite 'about-alias'
+about-alias 'tmux aliases and overrides'
+
+alias tmux='TERM=screen-256color tmux'

aliases/available/zzz.aliases.bash

@@ -0,0 +1,6 @@
+cite about-alias
+about-alias 'development aliases'
+
+alias m='LOADADDR=0x80800000 make -j16 uImage dtbs'
+alias m2='m 2> errors.err'
+alias c='cp arch/arm/boot/uImage arch/arm/boot/dts/*.dtb /media/mturquette/165A-3C60/ && sync'

plugins/available/extract.plugin.bash

@@ -25,3 +25,29 @@ extract () {
 		echo "'$1' is not a valid file"
 	fi
 }
+
+extract-preview () {
+  if [ $# -ne 1 ]
+  then
+    echo "Error: No file specified."
+    return 1
+  fi
+	if [ -f $1 ] ; then
+		case $1 in
+			*.tar.bz2) tar tvjf $1   ;;
+			*.tar.gz)  tar tvzf $1   ;;
+			#*.bz2)     bunzip2 $1    ;;
+			#*.rar)     unrar x $1    ;;
+			#*.gz)      gunzip $1     ;;
+			*.tar)     tar tvf $1    ;;
+			*.tbz2)    tar tvjf $1   ;;
+			*.tgz)     tar tvzf $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
+}

plugins/available/git.plugin.bash

@@ -129,7 +129,7 @@ function git_info() {
         echo "-----------------"
         echo
 
-        # print all remotes and thier details
+        # print all remotes and their details
         for remote in $(git remote show); do
             echo $remote:
             git remote show $remote

plugins/available/javascript.plugin.bash

@@ -27,7 +27,7 @@ function jquery_install {
 }
 
 function jquery_ui_install {
-  about 'download jquery_us.js into public/javascripts'
+  about 'download jquery_ui.js into public/javascripts'
   group 'javascript'
 
   if [ -z "$1" ]

themes/square/square.theme.bash

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+prompt() {
+  PS1="${green}\w${reset_color} $(__git_ps1 [${red}%s${reset_color}])$ "
+}
+
+PROMPT_COMMAND=prompt