mcy
/
scripts
1
0
Fork 0
Code Issues Pull Requests Releases Activity

[ssl_mgmt] Fix support for empty field values

This commit is contained in:
Thomas Preud'homme 2014-03-09 17:16:27 +08:00
parent 6a92f1c01c
commit 1309f7d718
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ssl_mgmt/ssl_mgmt
View File

@ -126,7 +126,10 @@ get_field_from_line ()
line="$1" line="$1"
field="$2" field="$2"
result="${line#*$field=}" result="${line#*$field=}"
echo "${result%%/*}" if [ "$result" != "$line" ]
then
echo "${result%%/*}"
fi
} }
get_cert_params () get_cert_params ()
@ -170,10 +173,7 @@ add_to_replace_cmd ()
replaceCmd="$1" replaceCmd="$1"
key="$2" key="$2"
value="$3" value="$3"
if [ -n "$value" ] echo "$replaceCmd${replaceCmd:+;}s/$key/${value:-}/"
then
echo "$replaceCmd${replaceCmd:+;}s/$key/$value/"
fi
} }
generate_config () generate_config ()
@ -199,8 +199,7 @@ generate_config ()
editor $cnfTmpFile editor $cnfTmpFile
fi fi
fi fi
grep -v "@[A-Z]\+@" $cnfTmpFile > $confFile mv $cnfTmpFile $confFile
rm $cnfTmpFile
} }
generate_cert () generate_cert ()