From f8c8411297f46571e577fb236dadb195ad87a930 Mon Sep 17 00:00:00 2001 From: Frank Cizmich Date: Mon, 19 Jan 2015 14:58:47 -0200 Subject: [PATCH] simplified conditional for testing if HOME is set --- bin/pt-ioprofile | 2 +- bin/pt-mext | 2 +- bin/pt-mysql-summary | 2 +- bin/pt-pmp | 2 +- bin/pt-sift | 2 +- bin/pt-stalk | 2 +- bin/pt-summary | 2 +- lib/bash/parse_options.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/pt-ioprofile b/bin/pt-ioprofile index 83951b18..123cd0a0 100755 --- a/bin/pt-ioprofile +++ b/bin/pt-ioprofile @@ -202,7 +202,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-mext b/bin/pt-mext index 60310a99..0fb7e1fb 100755 --- a/bin/pt-mext +++ b/bin/pt-mext @@ -243,7 +243,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-mysql-summary b/bin/pt-mysql-summary index fab7fd91..287d39ad 100755 --- a/bin/pt-mysql-summary +++ b/bin/pt-mysql-summary @@ -204,7 +204,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-pmp b/bin/pt-pmp index 2fed95fa..8f029967 100755 --- a/bin/pt-pmp +++ b/bin/pt-pmp @@ -245,7 +245,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-sift b/bin/pt-sift index 4660fe0d..53f5e4d8 100755 --- a/bin/pt-sift +++ b/bin/pt-sift @@ -243,7 +243,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-stalk b/bin/pt-stalk index ece14424..568f4587 100755 --- a/bin/pt-stalk +++ b/bin/pt-stalk @@ -256,7 +256,7 @@ parse_options() { done else _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" fi fi diff --git a/bin/pt-summary b/bin/pt-summary index 1e045113..af68ccf7 100755 --- a/bin/pt-summary +++ b/bin/pt-summary @@ -211,7 +211,7 @@ parse_options() { done else _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" fi fi diff --git a/lib/bash/parse_options.sh b/lib/bash/parse_options.sh index d5a3fed0..eee9e154 100644 --- a/lib/bash/parse_options.sh +++ b/lib/bash/parse_options.sh @@ -215,7 +215,7 @@ parse_options() { else _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 - if [ ! -z "${HOME-}" ]; then + if [ "${HOME:-}" ]; then _parse_config_files "$HOME/.percona-toolkit.conf" "$HOME/.$TOOL.conf" fi fi