X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bash_profile;h=da0b8fbf838a73d54b5f9c5676fba1600fba4eeb;hb=3262e9ccf8b8ad200b0da49de48d12bf827330c4;hp=c80cb2dd74ef94227357e06a45e21e74337efec5;hpb=6064692c3e68554e4aa791befac2bf8b496e4aee;p=max%2Fdotfiles.git diff --git a/bash/.bash_profile b/bash/.bash_profile index c80cb2d..da0b8fb 100644 --- a/bash/.bash_profile +++ b/bash/.bash_profile @@ -1,24 +1,10 @@ -export NPM_PACKAGES="$HOME/.npm-packages" -export EDITOR="/usr/bin/vim" -export PAGER="/usr/bin/less" -export PATH="/home/max/.local/bin:$NPM_PACKAGES/bin:$HOME/.gem/ruby/2.1.0/bin/:$HOME/.rvm/bin:${PATH}" -[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" -unset MANPATH -MANPATH="$NPM_PACKAGES/share/man:$(manpath)" -NODE_PATH="$NPM_PACKAGES/lib/node_modules:$NODE_PATH" - -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" - fi -fi - -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion +if [ -r ~/.profile ]; then + . ~/.profile; fi -export TMPDIR="/home/max/.local/tmp" - -gpg-agent --daemon --enable-ssh-support \ - --write-env-file "${HOME}/.gpg-agent-info" +case "$-" in *i*) + if [ -r ~/.bashrc ]; then + . ~/.bashrc + fi + ;; +esac