From c1a578975451f1de79cbbdcd4f2d502968184862 Mon Sep 17 00:00:00 2001 From: Jannik Zander Date: Sun, 22 May 2016 13:47:25 +0200 Subject: [PATCH] Move path and exports to profile --- .bashrc | 3 --- .config/{bash => profile}/rc/exports | 0 .config/{bash => profile}/rc/paths | 25 +++++++++---------------- .profile | 7 ++++++- 4 files changed, 15 insertions(+), 20 deletions(-) rename .config/{bash => profile}/rc/exports (100%) rename .config/{bash => profile}/rc/paths (50%) diff --git a/.bashrc b/.bashrc index d1aca1d..3294677 100644 --- a/.bashrc +++ b/.bashrc @@ -7,6 +7,3 @@ for file in ${HOME}/.config/bash/rc/*; do [ -f "$file" ] && source "$file"; done; - -# Local/private settings -[ -f "${HOME}/.config/bash/bashrc_local" ] && source "${HOME}/.config/bash/bashrc_local" diff --git a/.config/bash/rc/exports b/.config/profile/rc/exports similarity index 100% rename from .config/bash/rc/exports rename to .config/profile/rc/exports diff --git a/.config/bash/rc/paths b/.config/profile/rc/paths similarity index 50% rename from .config/bash/rc/paths rename to .config/profile/rc/paths index eec134f..c3cf39a 100644 --- a/.config/bash/rc/paths +++ b/.config/profile/rc/paths @@ -1,32 +1,25 @@ # Set PATH so it includes user's private bin if it exists -# if [ -d "${HOME}/bin" ] ; then -# PATH="${HOME}/bin:${PATH}" -# fi +if [ -d "${HOME}/bin" ] ; then + PATH="${HOME}/bin:${PATH}" +fi # Set MANPATH so it includes users' private man if it exists -# if [ -d "${HOME}/man" ]; then -# MANPATH="${HOME}/man:${MANPATH}" -# fi +if [ -d "${HOME}/man" ]; then + MANPATH="${HOME}/man:${MANPATH}" +fi # Set INFOPATH so it includes users' private info if it exists -# if [ -d "${HOME}/info" ]; then -# INFOPATH="${HOME}/info:${INFOPATH}" -# fi +if [ -d "${HOME}/info" ]; then + INFOPATH="${HOME}/info:${INFOPATH}" +fi # Set PATH to temporary folders export TEMPDIR="${HOME}/tmp" export TMPDIR="${HOME}/tmp" -# Set PATH to dotfiles git folder -export DOTFILES="${HOME}/.dotfiles" - # Set PATH to PREFIX folders export PREFIX="${HOME}" -PATH="${PREFIX}/bin:${PATH}" -MANPATH="${PREFIX}/share/man:${MANPATH}" -INFOPATH="${PREFIX}/share/info:${INFOPATH}" - # Add local libraries to libpath # LD_LIBRARY_PATH="${PREFIX}/lib:${LD_LIBRARY_PATH}" diff --git a/.profile b/.profile index e7c2b1c..6a67f4f 100644 --- a/.profile +++ b/.profile @@ -2,7 +2,12 @@ # This file is not read by bash(1) if ~/.bash_profile or ~/.bash_login # exists. -# + +# Run scripts +for file in ${HOME}/.config/profile/rc/*; do + [ -f "$file" ] && source "$file"; +done; + # if running bash if [ -n "${BASH_VERSION}" ]; then # source the users bashrc if it exists -- 2.43.0