sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't match editor backup files in environment

Browse Source 
The current glob match for environment files can source editor backup
files (foo.bash~) which will override the real changes you have made.

Other parts matche use the regex to avoid matching such files, so do
the same for environment file matching.  Note this has to match "."
unlike the other regex, as most env files are "foo.bash"

Change-Id: I934486b3ff5884063d29c6d9b66fd9b11140464c
This commit is contained in:
Ian Wienand 2014-07-03 11:39:53 +10:00
parent 451e571753
commit 32eda4b92f
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/dib-run-parts/bin/dib-run-parts
View File

@ -73,8 +73,11 @@ 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
for env_file in $ENVIRONMENT_D_DIR/* ; do env_files=$(find $ENVIRONMENT_D_DIR \
source $env_file -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 done
fi fi