File tree Expand file tree Collapse file tree 3 files changed +33
-3
lines changed Expand file tree Collapse file tree 3 files changed +33
-3
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,17 @@ for arg; do
19
19
done
20
20
21
21
_datadir () {
22
- " $@ " --verbose --help --log-bin-index=` mktemp -u` 2> /dev/null | awk ' $1 == "datadir" { print $2; exit }'
22
+ toRun=( " $@ " --verbose --help --log-bin-index=" $( mktemp -u) " )
23
+ if ! " ${toRun[@]} " 2> /tmp/mysql-config-error.log | awk ' $1 == "datadir" { print $2; exit }' ; then
24
+ cat >&2 - /tmp/mysql-config-error.log << -EOM
25
+
26
+ ERROR: mysqld failed while attempting to determine datadir
27
+ command was: "${toRun[*]} "
28
+
29
+ EOM
30
+ exit 1
31
+ fi
32
+ rm /tmp/mysql-config-error.log
23
33
}
24
34
25
35
# allow the container to be started with `--user`
Original file line number Diff line number Diff line change @@ -19,7 +19,17 @@ for arg; do
19
19
done
20
20
21
21
_datadir () {
22
- " $@ " --verbose --help --log-bin-index=` mktemp -u` 2> /dev/null | awk ' $1 == "datadir" { print $2; exit }'
22
+ toRun=( " $@ " --verbose --help --log-bin-index=" $( mktemp -u) " )
23
+ if ! " ${toRun[@]} " 2> /tmp/mysql-config-error.log | awk ' $1 == "datadir" { print $2; exit }' ; then
24
+ cat >&2 - /tmp/mysql-config-error.log << -EOM
25
+
26
+ ERROR: mysqld failed while attempting to determine datadir
27
+ command was: "${toRun[*]} "
28
+
29
+ EOM
30
+ exit 1
31
+ fi
32
+ rm /tmp/mysql-config-error.log
23
33
}
24
34
25
35
# allow the container to be started with `--user`
Original file line number Diff line number Diff line change @@ -19,7 +19,17 @@ for arg; do
19
19
done
20
20
21
21
_datadir () {
22
- " $@ " --verbose --help 2> /dev/null | awk ' $1 == "datadir" { print $2; exit }'
22
+ toRun=( " $@ " --verbose --help )
23
+ if ! " ${toRun[@]} " 2> /tmp/mysql-config-error.log | awk ' $1 == "datadir" { print $2; exit }' ; then
24
+ cat >&2 - /tmp/mysql-config-error.log << -EOM
25
+
26
+ ERROR: mysqld failed while attempting to determine datadir
27
+ command was: "${toRun[*]} "
28
+
29
+ EOM
30
+ exit 1
31
+ fi
32
+ rm /tmp/mysql-config-error.log
23
33
}
24
34
25
35
# allow the container to be started with `--user`
You can’t perform that action at this time.
0 commit comments