Skip to content

Commit 01c4594

Browse files
committed
!fixup Don't add same conf files twice on re-runs
1 parent b795a5b commit 01c4594

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

el_configurator.sh

+5-10
Original file line numberDiff line numberDiff line change
@@ -178,23 +178,18 @@ set_conf_value() {
178178
if [ -f "$file" ]; then
179179
if grep "^${name}=" "${file}" > /dev/null 2>&1; then
180180
# Using -i.tmp for BSD compat
181-
sed -i.tmp "s${separator}^${name}${xzz}.*${separator}${name}${xzz}${value}${separator}" "${file}"
181+
sed -i.eltmp "s${separator}^${name}${sed_separator}.*${separator}${name}${sed_separator}${value}${separator}" "${file}"
182182
if [ $? -ne 0 ]; then
183183
log "Cannot update value [${name}] to [${value}] in file [${file}]." "ERROR"
184184
fi
185-
rm -f "$file.tmp"
185+
# Remove temp file if exists
186+
rm -f "$file.eltmp" > /dev/null 2>&1
186187
log "Set [${name}] to [${value}] in file [${file}]." "INFO"
187188
else
188-
echo "${name}${separator}${value}" >> "${file}"
189-
if [ $? -ne 0 ]; then
190-
log "Cannot create value [${name}] to [${value}] in file [${file}]." "ERROR"
191-
fi
189+
echo "${name}${separator}${value}" >> "${file}" || log "Cannot create value [${name}] to [${value}] in file [${file}]." "ERROR"
192190
fi
193191
else
194-
echo "${name}${separator}${value}" > "${file}"
195-
if [ $? -ne 0 ]; then
196-
Logger "File [${file}] does not exist. Failed to create it with value [$name]" "ERROR"
197-
fi
192+
echo "${name}${separator}${value}" > "${file}" || log "File [${file}] does not exist. Failed to create it with value for [${name}]" "ERROR"
198193
fi
199194
}
200195

0 commit comments

Comments
 (0)