Skip to content

Commit

Permalink
Merge pull request #872 from daxgames/fix_bash_profile.d
Browse files Browse the repository at this point in the history
silenced bash profile.d when profile.d is empty
  • Loading branch information
Stanzilla committed Mar 6, 2016
2 parents df768f3 + 722f8b7 commit 72876f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion vendor/cmder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ fi
if [ -d "${CMDER_ROOT}/config/profile.d" ] ; then
unset profile_d_scripts
pushd ${CMDER_ROOT}/config/profile.d >/dev/null
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh) 2>/dev/null
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)

if [ ! "x${profile_d_scripts}" = "x" ] ; then
for x in ${profile_d_scripts} ; do
Expand Down
4 changes: 2 additions & 2 deletions vendor/cmder_exinit
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ if [ ! "$CMDER_ROOT" = "" ] ; then
unset profile_d_scripts
pushd ${CMDER_ROOT}/config/profile.d >/dev/null
if [ ! "x${ZSH_VERSION}" = "x" ]; then
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh) 2>/dev/null
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.zsh 2>/dev/null)
elif [ ! "x${BASH_VERSION}" = "x" ]; then
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh) 2>/dev/null
profile_d_scripts=$(ls ${CMDER_ROOT}/config/profile.d/*.sh 2>/dev/null)
fi

if [ ! "x${profile_d_scripts}" = "x" ] ; then
Expand Down

0 comments on commit 72876f4

Please sign in to comment.