From bbf62fc5b93ee7fa3bfed9ea4478a6f44c94f399 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 8 Jul 2014 11:12:04 -0400 Subject: [PATCH] Revert "Don't match editor backup files in env... This reverts commit 32eda4b92faa7b0f3420524b2641ef1a199756e9. 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 --- elements/dib-run-parts/bin/dib-run-parts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/elements/dib-run-parts/bin/dib-run-parts b/elements/dib-run-parts/bin/dib-run-parts index 354172b3..1aed34b2 100755 --- a/elements/dib-run-parts/bin/dib-run-parts +++ b/elements/dib-run-parts/bin/dib-run-parts @@ -73,11 +73,8 @@ PROFILE_DIR=$(mktemp -d /tmp/profiledir.XXXXXX) ENVIRONMENT_D_DIR=$target_dir/../environment.d if [ -d $ENVIRONMENT_D_DIR ] ; then - 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 + for env_file in $ENVIRONMENT_D_DIR/* ; do + source $env_file done fi