Revert "Don't match editor backup files in env...
This reverts commit 32eda4b92f
.
I noticed today that environment.d files no longer seem to get sourced
by DIB. Reverting this commit fixes it.
Change-Id: I08a8feab541901c8fd0a803628f5aeb6c0eec598
Closes-bug: #1339116
This commit is contained in:
parent
3cdfd9565e
commit
bbf62fc5b9
@ -73,11 +73,8 @@ PROFILE_DIR=$(mktemp -d /tmp/profiledir.XXXXXX)
|
|||||||
ENVIRONMENT_D_DIR=$target_dir/../environment.d
|
ENVIRONMENT_D_DIR=$target_dir/../environment.d
|
||||||
|
|
||||||
if [ -d $ENVIRONMENT_D_DIR ] ; then
|
if [ -d $ENVIRONMENT_D_DIR ] ; then
|
||||||
env_files=$(find $ENVIRONMENT_D_DIR \
|
for env_file in $ENVIRONMENT_D_DIR/* ; do
|
||||||
-maxdepth 1 -xtype f -printf '%f\n' | \
|
source $env_file
|
||||||
grep -E "^[0-9A-Za-z_\.-]+$")
|
|
||||||
for env_file in $env_files ; do
|
|
||||||
source $ENVIRONMENT_D_DIR/$env_file
|
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user