From e97108efd70f58254bba40f80e40a25d1ff5cb65 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 27 Aug 2018 17:12:13 +0100
Subject: [PATCH] Use tail
---
src/freedombone-installer | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 3e2430bb4..42fa21c9a 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1811,18 +1811,15 @@ function update_system_monitor {
test_drive=/dev/sda1
if [[ "$drives_list" != *"$test_drive"* ]]; then
test_drive=/dev/mmcblk0p2
- if [[ "$drives_list" != *"$test_drive"* ]]; then
- test_drive=/dev/mmcblk0p1
- else
- test_drive=
- fi
+ else
+ test_drive=/dev/mmcblk0p1
fi
fi
disk_use=$(df -h | grep $test_drive)
disk_use_percent='0%'
if [[ "$disk_use" == *"$test_drive"* ]]; then
- disk_use_percent=$(df -h | grep $test_drive | head_n 1 | awk -F ' ' '{print $5}')
+ disk_use_percent=$(df -h | grep $test_drive | tail -n 1 | awk -F ' ' '{print $5}')
fi
used_memory=$(free -m | grep "Mem:" | awk -F ' ' '{print $3}')
@@ -1856,7 +1853,6 @@ function update_system_monitor {
if [ "$disk_use_percent" ]; then
sed -i "s|<div name=\"diskspace\" class=\"w3-container.*|<div name=\"diskspace\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$disk_use_percent\">$disk_use_percent</div>|g" "$webadmin_install_dir/system_monitor.html"
- sed -i "s|<div name=\"diskspace\" class=\"w3-container.*|<div name=\"diskspace\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:50\">$test_drive</div>|g" "$webadmin_install_dir/system_monitor.html"
fi
sed -i "s|<div name=\"memory\" class=\"w3-container.*|<div name=\"memory\" class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${used_memory_percent}%\">${used_memory_percent}%</div>|g" "$webadmin_install_dir/system_monitor.html"
--
GitLab