diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-16 14:20:30 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2019-07-16 14:20:30 +0300 |
| commit | fa8bad20db100d95cf089b0b2d897c339327215c (patch) | |
| tree | 2f80f2e015d26056cd741137dc4fdd069a6c4c5d /include/helper_show | |
| parent | 2777caf6d218aeb40c2ebd8af2564be8201eeff1 (diff) | |
Use -n instead of ! -z
Diffstat (limited to 'include/helper_show')
| -rw-r--r-- | include/helper_show | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/helper_show b/include/helper_show index d1086378..8f906d99 100644 --- a/include/helper_show +++ b/include/helper_show @@ -154,7 +154,7 @@ if [ $# -gt 0 ]; then # Check also for gzipped changelog elif [ -f ${FILEPATH}/changelog.gz ]; then ZCAT=$(which zcat 2> /dev/null | grep -v "no [^ ]* in ") - if [ ! -z "${ZCAT}" ]; then + if [ -n "${ZCAT}" ]; then CreateTempFile CHANGELOG="${TEMP_FILE}" LogText "Result: found gzipped changelog in ${FILEPATH}" @@ -164,9 +164,9 @@ if [ $# -gt 0 ]; then DisplayError "Could not find zcat utility to use on gzipped changelog" fi fi - if [ ! -z "${CHANGELOG}" ]; then LogText "Result: found changelog file: ${CHANGELOG}"; break; fi + if [ -n "${CHANGELOG}" ]; then LogText "Result: found changelog file: ${CHANGELOG}"; break; fi done - if [ ! -z "${CHANGELOG}" ]; then + if [ -n "${CHANGELOG}" ]; then SEARCH=$(sed 's/^## //' ${CHANGELOG} | grep -E "^${PROGRAM_NAME} ${SEARCH_VERSION}") if [ $? -eq 0 ]; then while read -r LINE; do @@ -358,7 +358,7 @@ if [ $# -gt 0 ]; then VALUE=$(echo ${LINE} | awk -F';' '{print $2}') DESCRIPTION=$(echo ${LINE} | awk -F';' '{print $3}' | sed 's/:space:/ /g') if [ -z "${VALUE}" -a ${CONFIGURED_ONLY_OUTPUT} -eq 0 ]; then VALUE="${GRAY}[not configured]${NORMAL}"; fi - if [ ! -z "${VALUE}" ]; then + if [ -n "${VALUE}" ]; then if [ ${BRIEF_OUTPUT} -eq 0 ]; then ${ECHOCMD} "${GRAY}# ${DESCRIPTION}${NORMAL}"; fi ${ECHOCMD} "${WHITE}${SETTING}${NORMAL}=${CYAN}${VALUE}${NORMAL}" if [ ${BRIEF_OUTPUT} -eq 0 ]; then ${ECHOCMD} ""; fi |