# HG changeset patch # User Oleksandr Gavenko # Date 1336592379 -10800 # Node ID 63fe7a1ebae413ff6288797f648478c88cf663a8 # Parent 478aa21d5debd8c399add6ebe5c3c9aa44f730da Load custom settings (user editable). diff -r 478aa21d5deb -r 63fe7a1ebae4 .bashrc --- a/.bashrc Sat May 05 00:21:14 2012 +0300 +++ b/.bashrc Wed May 09 22:39:39 2012 +0300 @@ -144,3 +144,11 @@ done fi +################################################################ +# Load custom settings (user editable). +# Placed to the end to allow override skel settings. + +if [[ -f ~/.bash_custom ]]; then + . ~/.bash_custom +fi + diff -r 478aa21d5deb -r 63fe7a1ebae4 .xinitrc --- a/.xinitrc Sat May 05 00:21:14 2012 +0300 +++ b/.xinitrc Wed May 09 22:39:39 2012 +0300 @@ -3,6 +3,10 @@ if [[ -f ~/.bash_path ]]; then . ~/.bash_path fi +# Load custom settings (user editable). +if [[ -f ~/.bash_custom ]]; then + . ~/.bash_custom +fi xrdb -merge ~/.Xdefaults # xrdb -load ~/.Xdefaults diff -r 478aa21d5deb -r 63fe7a1ebae4 Makefile --- a/Makefile Sat May 05 00:21:14 2012 +0300 +++ b/Makefile Wed May 09 22:39:39 2012 +0300 @@ -93,6 +93,8 @@ chmod a+x ~/.xinitrc ~/.xserverrc rm -f ~/.xsession ln -s ~/.xinitrc ~/.xsession + rm -f ~/.bash_profile + ln -s ~/.bashrc ~/.bash_profile v=`mc --version | sed 's|.*\([0-9]\+\.[0-9]\+\.[0-9]\+\)$$|\1|;q'`; \ vmajor=$${v%%.*}; \ vminor=$${v#*.}; \