Merge "Don't match editor backup files in environment"

This commit is contained in:
Jenkins 2014-07-07 11:51:08 +00:00 committed by Gerrit Code Review
commit 92d4ed73db

View File

@ -73,8 +73,11 @@ PROFILE_DIR=$(mktemp -d /tmp/profiledir.XXXXXX)
ENVIRONMENT_D_DIR=$target_dir/../environment.d
if [ -d $ENVIRONMENT_D_DIR ] ; then
for env_file in $ENVIRONMENT_D_DIR/* ; do
source $env_file
env_files=$(find $ENVIRONMENT_D_DIR \
-maxdepth 1 -xtype f -printf '%f\n' | \
grep -E "^[0-9A-Za-z_\.-]+$")
for env_file in $env_files ; do
source $ENVIRONMENT_D_DIR/$env_file
done
fi