Fix several quoting problems, and clean up IFS on failure in my_which().
This commit is contained in:
parent
e53a813352
commit
e7ed43065a
@ -18,7 +18,7 @@ niceness=0
|
|||||||
logging=init
|
logging=init
|
||||||
want_syslog=0
|
want_syslog=0
|
||||||
syslog_tag=
|
syslog_tag=
|
||||||
user=@MYSQLD_USER@
|
user='@MYSQLD_USER@'
|
||||||
pid_file=
|
pid_file=
|
||||||
err_log=
|
err_log=
|
||||||
|
|
||||||
@ -64,9 +64,10 @@ my_which ()
|
|||||||
{
|
{
|
||||||
save_ifs="${IFS-UNSET}"
|
save_ifs="${IFS-UNSET}"
|
||||||
IFS=:
|
IFS=:
|
||||||
|
ret=0
|
||||||
for file
|
for file
|
||||||
do
|
do
|
||||||
for dir in $PATH
|
for dir in "$PATH"
|
||||||
do
|
do
|
||||||
if [ -f "$dir/$file" ]
|
if [ -f "$dir/$file" ]
|
||||||
then
|
then
|
||||||
@ -74,15 +75,18 @@ my_which ()
|
|||||||
continue 2
|
continue 2
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
return 1 # Failure, didn't find file in path
|
|
||||||
|
ret=1 #signal an error
|
||||||
|
break
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$save_ifs" = UNSET ]
|
if [ "$save_ifs" = UNSET ]
|
||||||
then
|
then
|
||||||
unset IFS
|
unset IFS
|
||||||
else
|
else
|
||||||
IFS="$save_ifs"
|
IFS="$save_ifs"
|
||||||
fi
|
fi
|
||||||
return 0 # Success
|
return $ret # Success
|
||||||
}
|
}
|
||||||
|
|
||||||
log_generic () {
|
log_generic () {
|
||||||
@ -234,8 +238,8 @@ then
|
|||||||
ledir="$MY_PWD/libexec" # Where mysqld is
|
ledir="$MY_PWD/libexec" # Where mysqld is
|
||||||
# Since we didn't find anything, used the compiled-in defaults
|
# Since we didn't find anything, used the compiled-in defaults
|
||||||
else
|
else
|
||||||
MY_BASEDIR_VERSION=@prefix@
|
MY_BASEDIR_VERSION='@prefix@'
|
||||||
ledir=@libexecdir@
|
ledir='@libexecdir@'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
@ -413,7 +417,7 @@ then
|
|||||||
MYSQLD=mysqld
|
MYSQLD=mysqld
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test ! -x $ledir/$MYSQLD
|
if test ! -x "$ledir/$MYSQLD"
|
||||||
then
|
then
|
||||||
log_error "The file $ledir/$MYSQLD
|
log_error "The file $ledir/$MYSQLD
|
||||||
does not exist or is not executable. Please cd to the mysql installation
|
does not exist or is not executable. Please cd to the mysql installation
|
||||||
@ -425,7 +429,7 @@ fi
|
|||||||
|
|
||||||
if test -z "$pid_file"
|
if test -z "$pid_file"
|
||||||
then
|
then
|
||||||
pid_file=$DATADIR/`@HOSTNAME@`.pid
|
pid_file="$DATADIR/`@HOSTNAME@`.pid"
|
||||||
else
|
else
|
||||||
case "$pid_file" in
|
case "$pid_file" in
|
||||||
/* ) ;;
|
/* ) ;;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user