evolix/evocheck
evolix/evocheck
21
2
Fork 2
Code Issues 48 Pull requests 5 Releases 37 Wiki Activity

use bash array for tmp files to cleanup

Browse source
This commit is contained in:
Jérémy Lecour 2023-01-12 17:02:55 +01:00 committed by Jérémy Lecour
parent f5410be26c
commit f1074dea2d
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linux/CHANGELOG
View file

@ -11,6 +11,7 @@ New checks :
* IS_SSH_FAIL2BAN_JAIL_RENAMED * IS_SSH_FAIL2BAN_JAIL_RENAMED
* IS_NO_LXC_CONTAINER * IS_NO_LXC_CONTAINER
* IS_LXC_PHP_FPM_SERVICE_UMASK_SET * IS_LXC_PHP_FPM_SERVICE_UMASK_SET
* use bash array for tmp files to cleanup
### Changed ### Changed

20
linux/evocheck.sh
View file

@ -487,8 +487,8 @@ check_ssh_fail2ban_jail_renamed() {
} }
# Vérification de l'exclusion des montages (NFS) dans les sauvegardes # Vérification de l'exclusion des montages (NFS) dans les sauvegardes
check_evobackup_exclude_mount() { check_evobackup_exclude_mount() {
excludes_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.evobackup_exclude_mount.XXXXX") excludes_file=$(mktemp --tmpdir "evocheck.evobackup_exclude_mount.XXXXX")
files_to_cleanup="${files_to_cleanup} ${excludes_file}" files_to_cleanup+=("${excludes_file}")
# shellcheck disable=SC2044 # shellcheck disable=SC2044
for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do for evobackup_file in $(find /etc/cron* -name '*evobackup*' | grep -v -E ".disabled$"); do
@ -950,8 +950,8 @@ check_duplicate_fs_label() {
# Do it only if thereis blkid binary # Do it only if thereis blkid binary
BLKID_BIN=$(command -v blkid) BLKID_BIN=$(command -v blkid)
if [ -n "$BLKID_BIN" ]; then if [ -n "$BLKID_BIN" ]; then
tmpFile=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.duplicate_fs_label.XXXXX") tmpFile=$(mktemp --tmpdir "evocheck.duplicate_fs_label.XXXXX")
files_to_cleanup="${files_to_cleanup} ${tmpFile}" files_to_cleanup+=("${tmpFile}")
parts=$($BLKID_BIN -c /dev/null | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2) parts=$($BLKID_BIN -c /dev/null | grep -ve raid_member -e EFI_SYSPART | grep -Eo ' LABEL=".*"' | cut -d'"' -f2)
for part in $parts; do for part in $parts; do
@ -1332,8 +1332,8 @@ add_to_path() {
echo "$PATH" | grep -qF "${new_path}" || export PATH="${PATH}:${new_path}" echo "$PATH" | grep -qF "${new_path}" || export PATH="${PATH}:${new_path}"
} }
check_versions() { check_versions() {
versions_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.versions.XXXXX") versions_file=$(mktemp --tmpdir "evocheck.versions.XXXXX")
files_to_cleanup="${files_to_cleanup} ${versions_file}" files_to_cleanup+=("${versions_file}")
download_versions "${versions_file}" download_versions "${versions_file}"
add_to_path "/usr/share/scripts" add_to_path "/usr/share/scripts"
@ -1360,8 +1360,8 @@ main() {
# Detect operating system name, version and release # Detect operating system name, version and release
detect_os detect_os
main_output_file=$(mktemp --tmpdir="${TMPDIR:-/tmp}" "evocheck.main.XXXXX") main_output_file=$(mktemp --tmpdir "evocheck.main.XXXXX")
files_to_cleanup="${files_to_cleanup} ${main_output_file}" files_to_cleanup+=("${main_output_file}")
test "${IS_TMP_1777:=1}" = 1 && check_tmp_1777 test "${IS_TMP_1777:=1}" = 1 && check_tmp_1777
test "${IS_ROOT_0700:=1}" = 1 && check_root_0700 test "${IS_ROOT_0700:=1}" = 1 && check_root_0700
@ -1490,7 +1490,7 @@ main() {
} }
cleanup_temp_files() { cleanup_temp_files() {
# shellcheck disable=SC2086,SC2317 # shellcheck disable=SC2086,SC2317
rm -f ${files_to_cleanup} rm -f ${files_to_cleanup[@]}
} }
PROGNAME=$(basename "$0") PROGNAME=$(basename "$0")
@ -1505,7 +1505,7 @@ readonly ARGS
export LANG=C export LANG=C
export LANGUAGE=C export LANGUAGE=C
files_to_cleanup="" declare -a files_to_cleanup
# shellcheck disable=SC2064 # shellcheck disable=SC2064
trap cleanup_temp_files 0 trap cleanup_temp_files 0