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/binaries | |
| parent | 2777caf6d218aeb40c2ebd8af2564be8201eeff1 (diff) | |
Use -n instead of ! -z
Diffstat (limited to 'include/binaries')
| -rw-r--r-- | include/binaries | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/binaries b/include/binaries index 0fbefe46..5812003f 100644 --- a/include/binaries +++ b/include/binaries @@ -49,7 +49,7 @@ # Test if our PATH variable provides a set of paths. If so, reverse the order. If we discover the same binary # multiple times, the one first in PATH should be used. - if [ ! -z "${PATH}" ]; then + if [ -n "${PATH}" ]; then PATH_REVERSED=$(echo ${PATH} | awk -F: '{ for (i=NF; i>1; i--) printf("%s ",$i); print $1; }') BIN_PATHS=$(echo "${PATH_REVERSED}" | tr ':' ' ') fi @@ -84,7 +84,7 @@ LogText "Result: directory exists, but is actually a symlink" ShowSymlinkPath ${SCANDIR} if [ ${FOUNDPATH} -eq 1 ]; then - if [ ! -z "${SYMLINK}" -a -d ${SYMLINK} ]; then + if [ -n "${SYMLINK}" -a -d ${SYMLINK} ]; then # Set path to new location LogText "Result: found the path behind this symlink (${SCANDIR} --> ${sFILE})" ORGPATH="${SCANDIR}" @@ -100,7 +100,7 @@ # Add a space to make sure we discover a related directory if it was already scanned # The grep -v is to prevent a match /usr/bin in something like /usr/bin/core_perl FIND=$(echo ${BINARY_PATHS_FOUND} | grep ", ${SCANDIR}" | grep -v ", ${SCANDIR}/") - if [ ! -z "${FIND}" ]; then + if [ -n "${FIND}" ]; then SKIPDIR=1; LogText "Result: Skipping this directory as it was already scanned" fi @@ -273,7 +273,7 @@ done else LogText "Result: Directory ${SCANDIR} skipped" - if [ ! -z "${ORGPATH}" ]; then TEXT="${ORGPATH} (links to ${SCANDIR})"; else TEXT="${SCANDIR}"; fi + if [ -n "${ORGPATH}" ]; then TEXT="${ORGPATH} (links to ${SCANDIR})"; else TEXT="${SCANDIR}"; fi fi else LogText "Result: Directory ${SCANDIR} does NOT exist" |