Skip to content

Commit c9d47b3

Browse files
committed
Fixed some prompts, and ignores mounts when looking for original install date.
1 parent 8aa3c91 commit c9d47b3

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

system-info

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ function CheckPrerequisites()
211211
# a useful option to see if there "is" a SecureBoot option in the BIOS, besides just what it is set at. This, during
212212
# tests, is safe to install on Legacy Only BIOS systems and can be used to tell if the BIOS is such.
213213
echo -e "$faintvid \"${Program}\" could not be found. This program is suggested.$resetvid"
214-
echo -e "$faintvid If this is older hardware that is 'Legacy Only BIOS', then this can be ignored."
214+
echo -e "$faintvid If this is older hardware that is 'Legacy Only BIOS', then this can be ignored.$resetvid"
215215
check_mokutil=0; # Set Flag to false and recheck in GetSb()
216216
check_prog=0;
217-
debug "$Program is not installed" 1
217+
debug "'$Program' is not installed" 1
218218
else
219-
echo -e "$Program is not installed."
219+
echo -e "'$Program' is not installed."
220220
check_prog=0;
221221
fi
222222
echo -e " -------------------------------- "
@@ -554,7 +554,7 @@ function GetDiskInfo()
554554
df -hT -x tmpfs -x devtmpfs | grep -v '/snap/'
555555
nl
556556
echo -e "${setansi}---------- Disk/Partition Information From 'fdisk':$ransi"
557-
sudo fdisk -l | sed '/\/dev\/loop/,+3 d' 2> /dev/null | uniq
557+
sudo fdisk -l 2>&1 | sed '/\/dev\/loop/,+3 d' 2> /dev/null | uniq
558558
nl
559559
echo -e "${setansi}---------- Disk/Partition Information From 'lsblk':$ransi"
560560
lsblk -o NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT,MODEL | grep -v '/snap/'
@@ -718,7 +718,21 @@ function GetOriginalInstallDate()
718718
installer_date="Original Installation Date: ${setansi} ${installer_date%.*} $ransi"
719719
else
720720
debug "$(sudo find / -maxdepth 1 -type d -printf "%T+ %p\n" > /dev/null | sort| head -1 )" 1
721-
installer_date=$(sudo find / -maxdepth 1 -type d -printf "%T+ %p\n" 2> /dev/null | sort | head -1)
721+
#installer_date=$(sudo find / -maxdepth 1 -type d -printf "%T+ %p\n" 2> /dev/null | sort | head -1)
722+
installer_date=$( \
723+
for i in /*; \
724+
do \
725+
if ! mountpoint -q "$i"; \
726+
then \
727+
stat --format='%y %n' "$i"; \
728+
else \
729+
echo -e 'Could not accurately determine original Installation Date.'
730+
fi; \
731+
done \
732+
| sort \
733+
| head -1 \
734+
| sed 's/ .*//' )
735+
#installer_date=$(sudo find / -maxdepth 1 -type d -printf "%T+ %p\n" 2> /dev/null | sort | head -1)
722736
installer_date="Estimated Installation Date: ${setansi} ${installer_date%.*} $ransi"
723737
fi
724738
echo -e "$installer_date"

0 commit comments

Comments
 (0)