|
@@ -92,7 +92,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
|
|
|
echo "Using $INITFILE as base"
|
|
echo "Using $INITFILE as base"
|
|
|
cat $INITFILE > $TMP_FILE
|
|
cat $INITFILE > $TMP_FILE
|
|
|
|
|
|
|
|
-# Merge files, printing warnings on overrided values
|
|
|
|
|
|
|
+# Merge files, printing warnings on overridden values
|
|
|
for MERGE_FILE in $MERGE_LIST ; do
|
|
for MERGE_FILE in $MERGE_LIST ; do
|
|
|
echo "Merging $MERGE_FILE"
|
|
echo "Merging $MERGE_FILE"
|
|
|
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
|
|
CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
|
Masahiro Yamada