percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 05:29:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #172 from percona/PT-76

Browse Source 
PT-76 Fixed cmd line parsing for lines having #
This commit is contained in:
Carlos Salguero
2017-03-21 19:23:37 +02:00
committed by GitHub
parent e29a50c887 43a58c4c64
commit 2e64421972
8 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/bash/parse_options.sh
View File

@@ -54,6 +54,7 @@ HAVE_EXT_ARGV="" # Got --, everything else is put into EXT_ARGV
OPT_ERRS=0 # How many command line option errors
OPT_VERSION="" # If --version was specified
OPT_HELP="" # If --help was specified
OPT_ASK_PASS="" # If --ask-pass was specified
PO_DIR="" # Directory with program option spec files
# Sub: usage
@@ -182,6 +183,7 @@ parse_options() {
OPT_ERRS=0
OPT_VERSION=""
OPT_HELP=""
OPT_ASK_PASS=""
PO_DIR="$PT_TMPDIR/po"
# Ready the directory for the program option (po) spec files.
@@ -346,7 +348,7 @@ _parse_config_files() {
# Strip leading and trailing spaces, and spaces around the first =,
# and end-of-line # comments.
config_opt="$(echo "$config_opt" | sed -e 's/^ *//g' -e 's/ *$//g' -e 's/[ ]*=[ ]*/=/' -e 's/[ ]*#.*$//')"
config_opt="$(echo "$config_opt" | sed -e 's/^ *//g' -e 's/ *$//g' -e 's/[ ]*=[ ]*/=/' -e 's/[ ]+#.*$//')"
# Skip blank lines.
[ "$config_opt" = "" ] && continue