Marty/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Wiki Activity

bash: Fix git stash alias setting

Browse source 
Fixed bash alias loading for additional modules by loading both general
sh aliases as well as individual bash aliases.

Moved git stash push/save aliasing to split between bash/zsh shell since
zsh can check for the correct version of git to invoke push command
(only part of git since 2.13) and bash simply falls back to save.
This commit is contained in:
Marty Oehme 2021-07-07 10:24:04 +02:00
parent 226c4b5f0d
commit bb9030f885
Signed by: Marty
GPG key ID: B7538B8F50A1C800
4 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bash/.bashrc
View file

@ -11,10 +11,17 @@ CONFDIR="${XDG_CONFIG_HOME:-$HOME/.config}"
[ -f "$CONFDIR/sh/alias" ] && source "$CONFDIR/sh/alias"
# load additional aliases
if [ -d "$CONFDIR/sh/alias.d" ]; then
for _alias in "$CONFDIR/sh/alias.d"/*.sh; do
. "$_alias"
done
unset _alias
for _alias in "$CONFDIR/sh/alias.d"/*.sh; do
. "$_alias"
done
unset _alias
fi
if [ -d "$CONFDIR/bash/alias.d" ]; then
for _alias in "$CONFDIR/bash/alias.d"/*.sh; do
. "$_alias"
done
unset _alias
fi
alias ls='ls --color=auto'
PS1='[\u@\h \W]\$ '