From 4fba1ce6d2f4232e63304080241af7b57c724329 Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Sat, 5 Jan 2013 14:55:53 -0800 Subject: [PATCH 1/9] aliases: git: consistent behavior for git users The case block in git.aliases.bash does the right thing for vim users that do not populate $EDITOR. However vim users that populate $EDITOR are met with the following error: $ gd Vim: Warning: Input is not from a terminal Vim: Error reading input, exiting... Vim: preserving files... Vim: Finished. Fix this inconsistency by adding another case block in the else block which handles passing the appropriate arguments to vim. Signed-off-by: Michael Turquette --- aliases/available/git.aliases.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index ab868532..803f7a17 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -47,5 +47,11 @@ if [ -z "$EDITOR" ]; then ;; esac else - alias gd="git diff | $EDITOR" + case $EDITOR in + *vim*) + alias gd="git diff | $EDITOR -R -" + ;; + *) + alias gd="git diff | $EDITOR" + esac fi From fccf91728e7dfc247f4eaeaeffb85a4420f44b25 Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Sat, 5 Jan 2013 15:06:22 -0800 Subject: [PATCH 2/9] plugins: extract: add new preview-extract function It is often desirable to inspect the contents of an archive before unpacking it. Add a new function, preview-extract, which does this. preview-extract is a copy-paste of extract(), but the tar commands have parameter 'x' replaced with 't' to print the pathes of any files in the archive. The non-tar lines have been commented out since I rarely use those and don't know the equivalent parameters off hand. Hopefully a kind soul will add those in. Signed-off-by: Michael Turquette --- plugins/available/extract.plugin.bash | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/plugins/available/extract.plugin.bash b/plugins/available/extract.plugin.bash index bb520451..906be114 100644 --- a/plugins/available/extract.plugin.bash +++ b/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 +} From 4f5bdd993e1012b0758481c8cb795dbc92cb55ea Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Sat, 5 Jan 2013 15:11:11 -0800 Subject: [PATCH 3/9] plugins: trivial typo fixes Signed-off-by: Michael Turquette --- plugins/available/git.plugin.bash | 2 +- plugins/available/javascript.plugin.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/available/git.plugin.bash b/plugins/available/git.plugin.bash index 0b771111..610a8cd9 100644 --- a/plugins/available/git.plugin.bash +++ b/plugins/available/git.plugin.bash @@ -43,7 +43,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 diff --git a/plugins/available/javascript.plugin.bash b/plugins/available/javascript.plugin.bash index e8037b9d..ec4123c6 100644 --- a/plugins/available/javascript.plugin.bash +++ b/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" ] From 0b6401fa77bff0f7f3874d250a0d5f070ba1d606 Mon Sep 17 00:00:00 2001 From: Mike Turquette Date: Sat, 5 Jan 2013 15:16:42 -0800 Subject: [PATCH 4/9] themes: new square theme square is a mix of the existing 'minimal' and 'standard' themes without any unicode characters that might fail to render in some terminal emulators. Signed-off-by: Michael Turquette --- themes/square/square.theme.bash | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 themes/square/square.theme.bash diff --git a/themes/square/square.theme.bash b/themes/square/square.theme.bash new file mode 100644 index 00000000..5beee8cf --- /dev/null +++ b/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 From edf66b21e606e428aae8dbd49d3854c4ae175873 Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Thu, 21 Nov 2013 23:13:09 -0800 Subject: [PATCH 5/9] aliases: new mturquette-specific aliases zdev is just a name that starts with 'z' (for parsing at the end) and 'dev' just means that these aliases have to do with development. Signed-off-by: Michael Turquette --- aliases/available/zdev.aliases.bash | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 aliases/available/zdev.aliases.bash diff --git a/aliases/available/zdev.aliases.bash b/aliases/available/zdev.aliases.bash new file mode 100644 index 00000000..d447be2a --- /dev/null +++ b/aliases/available/zdev.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' From 30c494fd7afb698759df5b27d91a38ea1a4dfb54 Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Thu, 21 Nov 2013 23:14:54 -0800 Subject: [PATCH 6/9] aliases: git mv zdev.aliases.bash zzz.aliases.bash Because zdev was a stupid name and zzz is awesome. Signed-off-by: Michael Turquette --- aliases/available/{zdev.aliases.bash => zzz.aliases.bash} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename aliases/available/{zdev.aliases.bash => zzz.aliases.bash} (100%) diff --git a/aliases/available/zdev.aliases.bash b/aliases/available/zzz.aliases.bash similarity index 100% rename from aliases/available/zdev.aliases.bash rename to aliases/available/zzz.aliases.bash From fa889d2fbd41b1665909b09a893152b242c6ac52 Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Thu, 21 Nov 2013 23:15:42 -0800 Subject: [PATCH 7/9] aliases: general.aliases.bash: comment 'c' zzz.aliases.bash introduced a difference alias for 'c', related to copying Linux kernel binaries to the SD card. Signed-off-by: Michael Turquette --- aliases/available/general.aliases.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash index 2439eb08..f6f8ae24 100644 --- a/aliases/available/general.aliases.bash +++ b/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' From 66b5d56b9eab0e9cea6fe6db3b89f0ba87bcb6f3 Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Thu, 21 Nov 2013 23:17:14 -0800 Subject: [PATCH 8/9] aliases: git.aliases.bash: git-sign-off New alias for quickly using git filter-branch to add my SoB to a set of patches. Use like so: git-sign-off HEAD~3..HEAD Signed-off-by: Michael Turquette --- aliases/available/git.aliases.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash index 803f7a17..f33521ff 100644 --- a/aliases/available/git.aliases.bash +++ b/aliases/available/git.aliases.bash @@ -33,6 +33,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 \""' if [ -z "$EDITOR" ]; then case $OSTYPE in From be647ff44896576fc19c48ec9678d9f5307a74fa Mon Sep 17 00:00:00 2001 From: Michael Turquette Date: Thu, 21 Nov 2013 23:18:48 -0800 Subject: [PATCH 9/9] aliases: tmux.aliases.bash I'm not sure if the 256-color alias introduced in this file is needed. Not enabled by default but I kept it around because I needed it at some point in the past... Signed-off-by: Michael Turquette --- aliases/available/tmux.aliases.bash | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 aliases/available/tmux.aliases.bash diff --git a/aliases/available/tmux.aliases.bash b/aliases/available/tmux.aliases.bash new file mode 100644 index 00000000..db97d868 --- /dev/null +++ b/aliases/available/tmux.aliases.bash @@ -0,0 +1,4 @@ +cite 'about-alias' +about-alias 'tmux aliases and overrides' + +alias tmux='TERM=screen-256color tmux'