mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-11 21:51:21 +00:00
simplified conditional for testing if HOME is set
This commit is contained in:
@@ -202,7 +202,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -243,7 +243,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -204,7 +204,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -245,7 +245,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -243,7 +243,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -256,7 +256,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -211,7 +211,7 @@ parse_options() {
|
|||||||
done
|
done
|
||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@@ -215,7 +215,7 @@ parse_options() {
|
|||||||
else
|
else
|
||||||
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
_parse_config_files "/etc/percona-toolkit/percona-toolkit.conf" "/etc/percona-toolkit/$TOOL.conf"
|
||||||
# conditional in case $HOME isn't set; e.g. tool launched from init
|
# conditional in case $HOME isn't set; e.g. tool launched from init
|
||||||
if [ ! -z "${HOME-}" ]; then
|
if [ "${HOME:-}" ]; then
|
||||||
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
_parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user