From 336241ff773c6f5d2edfd2ca947ac739779c8e4c Mon Sep 17 00:00:00 2001
From: Jed Reynolds <jed@candelatech.com>
Date: Tue, 16 Feb 2021 18:37:23 -0800
Subject: [PATCH] check_large_files.bash: several fixes:

- fixes parse error for kernel versions with '+' symbol
- fixes rpm kernel removal command that didn't remove packages
- fixes failure to find /mnt/lf files properly
- fixes lack of removing /mnt/lf files

Signed-off-by: Jed Reynolds <jed@candelatech.com>
---
 check_large_files.bash | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/check_large_files.bash b/check_large_files.bash
index c8f343be..32b1f248 100755
--- a/check_large_files.bash
+++ b/check_large_files.bash
@@ -180,8 +180,9 @@ kernel_to_relnum() {
     #set -euxv
     local hunks=()
     # 1>&2 echo "KERNEL RELNUM:[$1]"
-    local my1="${1/*[^0-9+]-/}" # Dang, this is not intuitive to a PCRE user
+    local my1="${1/*[^0-9]-/}" # Dang, this is not intuitive to a PCRE user
     #1>&2 echo "KERNEL [$1] REGEX:[$my1]"
+    my1="${my1//\+/}"
     if [[ $my1 =~ ^[^0-9] ]]; then
         1>&2 echo "BAD SERIES: [$1]"
         exit 1
@@ -216,7 +217,7 @@ clean_old_kernels() {
     if (( ${#removable_packages[@]} > 0 )); then
         for f in "${removable_packages[@]}"; do
             echo "$f\*"
-        done | xargs /usr/bin/rpm -hve
+        done | xargs /usr/bin/rpm --nodeps -hve
     fi
     if (( ${#removable_kernels[@]} > 0 )); then
         for f in "${removable_kernels[@]}"; do
@@ -311,10 +312,11 @@ clean_dnf_cache() {
 }
 
 clean_mnt_lf_files() {
-    note "clean mnt lf files WIP"
+    note "cleaning mnt lf files..."
     if (( $verbose > 0 )); then
         printf "%s\n" "${mnt_lf_files[@]}"
     fi
+    rm -f  "${mnt_lf_files[@]}"
 }
 
 compress_report_data() {
@@ -356,6 +358,7 @@ survey_kernel_files() {
     unset kernel_sort_serial
     unset pkg_sort_names
     unset libmod_sort_names
+    declare -A kernel_sort_serial=()
     declare -A kernel_sort_names=()
     declare -A pkg_sort_names=()
     declare -A libmod_sort_names=()
@@ -373,9 +376,10 @@ survey_kernel_files() {
     local file
     local fiile
     for file in "${kernel_files[@]}"; do
-        # echo "kernel_file [$file]"
+        echo "kernel_file [$file]"
         [[ $file =~ /boot/initramfs* ]] && continue
         [[ $file =~ *.fc*.x86_64 ]] && continue
+        [[ $file = *initrd-plymouth.img ]] && continue
         fiile=$( basename $file )
         fiile=${fiile%.img}
 
@@ -582,7 +586,7 @@ mnt_lf_files=()
 survey_mnt_lf_files() {
     [ ! -d /mnt/lf ] && return 0
     debug "Surveying mnt lf"
-    mapfile -t mnt_lf_files < <(find /mnt/lf -type f --one_filesystem 2>/dev/null)
+    mapfile -t mnt_lf_files < <(find /mnt/lf -xdev -type f 2>/dev/null)
     totals[m]=$(du -xhc "${mnt_lf_files[@]}" 2>/dev/null | awk '/total/{print $1}')
     [[ x${totals[m]} = x ]] && totals[m]=0
 }
@@ -610,7 +614,7 @@ survey_report_data() {
     cd /home/lanforge
     # set -veux
     local fsiz=0
-    local fnum=$( find -type f -a -name '*.csv' 2>/dev/null ||: | wc -l )
+    local fnum=$( find -type f -a -name '*.csv' 2>/dev/null | wc -l  ||:)
     # if (( $verbose > 0 )); then
         # hr
         # find -type f -a -name '*.csv' 2>/dev/null ||: