Merge pull request #872 from daxgames/fix_bash_profile.d

silenced bash profile.d when profile.d is empty
This commit is contained in:
Benjamin Staneck 2016-03-06 22:11:48 +01:00
commit 72876f41e2
2 changed files with 3 additions and 3 deletions

2
vendor/cmder.sh vendored
View File

@ -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

4
vendor/cmder_exinit vendored
View File

@ -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