From f0306dbcc41d1b548e93ddd244060309c9472c3d Mon Sep 17 00:00:00 2001 From: UltimateByte Date: Tue, 18 Oct 2016 14:18:14 +0200 Subject: [PATCH] stripping ./ from executable --- lgsm/functions/check_permissions.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lgsm/functions/check_permissions.sh b/lgsm/functions/check_permissions.sh index a7112238c..7cb88ac51 100644 --- a/lgsm/functions/check_permissions.sh +++ b/lgsm/functions/check_permissions.sh @@ -82,9 +82,11 @@ fn_check_permissions(){ fi fi # Check if executable is executable and attempt to fix it - if [ -f "${executabledir}/${executable}" ]; then + # First get executable name + execname="$(echo "${executable}" | awk -F "/" '{ print $2 }')" + if [ -f "${executabledir}/${execname}" ]; then # Get permission numbers on file under the form 775 - execperm="$(stat -c %a "${executabledir}/${executable}")" + execperm="$(stat -c %a "${executabledir}/${execname}")" # Grab the first and second digit for user and group permission userexecperm="${execperm:0:1}" groupexecperm="${execperm:1:1}" @@ -93,24 +95,24 @@ fn_check_permissions(){ # If user permission is invalid, then check for invalid group permissions if [ "${groupexecperm}" == "0" ] || [ "${groupexecperm}" == "2" ] || [ "${groupexecperm}" == "4" ] || [ "${groupexecperm}" == "6" ]; then # If permission issues are found - fn_print_warning "Permissions issue found" + fn_print_warn "Permissions issue found" fn_script_log_warn "Permissions issue found" fn_print_information_nl "The following file is not executable:" - ls -l "${executabledir}/${executable}" + ls -l "${executabledir}/${execname}" fn_script_log_info "The following file is not executable:" - fn_script_log_info "${executabledir}/${executable}" - fn_print_information_nl "Applying chmod u+x,g+x ${executabledir}/${executable}" + fn_script_log_info "${executabledir}/${execname}" + fn_print_information_nl "Applying chmod u+x,g+x ${executabledir}/${execname}" fn_script_log_info "Applying chmod u+x,g+x ${execperm}" # Make the executable executable - chmod u+x,g+x "${executabledir}/${executable}" + chmod u+x,g+x "${executabledir}/${execname}" # Second check to see if it's been successfully applied if [ "${userexecperm}" == "0" ] || [ "${userexecperm}" == "2" ] || [ "${userexecperm}" == "4" ] || [ "${userexecperm}" == "6" ]; then if [ "${groupexecperm}" == "0" ] || [ "${groupexecperm}" == "2" ] || [ "${groupexecperm}" == "4" ] || [ "${groupexecperm}" == "6" ]; then # If errors are still found fn_print_fail_nl "The following file could not be set executable:" - ls -l "${executabledir}/${executable}" + ls -l "${executabledir}/${execname}" fn_script_log_warn "The following file could not be set executable:" - fn_script_log_info "${executabledir}/${executable}" + fn_script_log_info "${executabledir}/${execname}" core_exit.sh fi fi