Added detection and display of profile directory

1 files changed, 4 insertions, 1 deletions

diff --git a/lynis b/lynis
index 8fc594b9..57bc6574 100755
--- a/lynis
+++ b/lynis
@@ -267,6 +267,7 @@ ${NORMAL}
     if [ "${PROFILE}" = "" ]; then
         CUSTOM_PROFILE=""
         DEFAULT_PROFILE=""
+        PROFILEDIR=""
         tPROFILE_NAMES="default.prf custom.prf"
         tPROFILE_TARGETS="/usr/local/etc/lynis /etc/lynis /usr/local/lynis ."
         for PNAME in ${tPROFILE_NAMES}; do
@@ -277,13 +278,15 @@ ${NORMAL}
                 elif [ "${PNAME}" = "custom.prf" -a ! "${CUSTOM_PROFILE}" = "" ]; then
                   Debug "Already discovered custom.prf - skipping this file (${PLOC}/${PNAME})"
                   else
-                    FILE="${PLOC}/${PNAME}"
+                    if [ "${PLOC}" = "." ]; then FILE="${WORKDIR}/${PNAME}"; else FILE="${PLOC}/${PNAME}"; fi
                     if [ -r ${FILE} ]; then
                         PROFILES="${PROFILES} ${FILE}"
                         case ${PNAME} in
                             "custom.prf") CUSTOM_PROFILE="${FILE}" ;;
                             "default.prf") DEFAULT_PROFILE="${FILE}" ;;
                         esac
+                        # Set profile directory to last match (Lynis could be both installed, and run as a separate download)
+                        if [ "${PLOC}" = "." ]; then PROFILEDIR="${WORKDIR}"; else PROFILEDIR="${PLOC}"; fi
                     fi
                 fi
             done