misc/zsh-config
1
0
Fork 1
Code Issues 9 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pztrn_changes' into 'master'

Browse Source 
FreeBSD's mc without subshell alias and silenced gitinfo.

Closes #3

See merge request !5
This commit is contained in:
Stanislav Nikitin
2017-01-15 14:57:32 +03:00
parent f5c89e1f6a 1288d9e542
commit 99ec072442
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zsh/aliases/20-freebsd.conf
View File

@@ -3,4 +3,7 @@
if [ "${OS/FreeBSD}" != "${OS}" ]; then if [ "${OS/FreeBSD}" != "${OS}" ]; then
# Files navigation. # Files navigation.
alias ls="ls -G" alias ls="ls -G"
# mc having troubles with subshells and normal users accounts.
# Force an alias that will launch mc without subshell capabilities.
alias mc="mc -u"
fi fi

6
zsh/apps/gitinfo.app.zsh
View File

@@ -103,9 +103,9 @@ function gitinfo_get_changes()
###################################################################### ######################################################################
function gitinfo_get_commit_data() function gitinfo_get_commit_data()
{ {
GITINFO_COMMIT_SHORTID=`git rev-parse --short HEAD | sed "s/ //g"` GITINFO_COMMIT_SHORTID=`git rev-parse --short HEAD 2>/dev/null | sed "s/ //g"`
GITINFO_COMMIT_ID=`git log | head -n 1 | cut -d " " -f 2 | sed "s/ //g"` GITINFO_COMMIT_ID=`git log 2>/dev/null | head -n 1 | cut -d " " -f 2 | sed "s/ //g"`
GITINFO_COMMIT_COUNT=`git log | grep "commit " | wc -l | sed "s/ //g"` GITINFO_COMMIT_COUNT=`git log 2>/dev/null | grep "commit " | wc -l | sed "s/ //g"`
} }
###################################################################### ######################################################################