|
|
|
@ -74,14 +74,14 @@ alias gw='grunt watch'
|
|
|
|
|
|
|
|
|
|
# custom bash with current git branch
|
|
|
|
|
function parse_git_dirty {
|
|
|
|
|
[[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo "*"
|
|
|
|
|
[[ $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" ]] && echo " *"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
function parse_git_branch {
|
|
|
|
|
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/[\1$(parse_git_dirty)]/"
|
|
|
|
|
git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e "s/* \(.*\)/(\1$(parse_git_dirty))/"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export PS1='\u@\h | \w\[\033[0;33m\] $(parse_git_branch) \[\033[00m\]$ '
|
|
|
|
|
export PS1='[\u \[\033[1;34m\]\w\[\033[0;33m\] $(parse_git_branch)\[\033[00m\]]$ '
|
|
|
|
|
|
|
|
|
|
# use ffmpeg to create nice web-videos and a jpg-still
|
|
|
|
|
ffencode () {
|
|
|
|
|