simplified conditional for testing if HOME is set

This commit is contained in:
Frank Cizmich
2015-01-19 14:58:47 -02:00
parent 18f85786ba
commit f8c8411297
8 changed files with 8 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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