From c723c2e5e6feb0e546a7b9649719dbda3a1474cf Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 13 Aug 2018 22:39:01 +0100
Subject: [PATCH] Memory percentage
---
src/freedombone-installer | 12 ++++++------
src/freedombone-utils-webadmin | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-installer b/src/freedombone-installer
index 822f560e9..f7e6d5c38 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -824,11 +824,11 @@ function update_progress_bar {
if [ $progress_percent -gt 100 ]; then
progress_percent=100
fi
- sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$progress_percent%\">$progress_percent%</div>|g" "$installing_page"
+ sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${progress_percent}%\">${progress_percent}%</div>|g" "$installing_page"
if ! grep -q 'w3-container w3-blue' "$webadmin_install_dir/index.html"; then
cp "$webadmin_install_dir/setup_installing.html" "$webadmin_install_dir/index.html"
fi
- sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$progress_percent%\">$progress_percent%</div>|g" "$webadmin_install_dir/index.html"
+ sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${progress_percent}%\">${progress_percent}%</div>|g" "$webadmin_install_dir/index.html"
}
function initiate_automatic_backup {
@@ -875,7 +875,7 @@ function update_backup_progress_bar {
if [ $progress_percent -gt 100 ]; then
progress_percent=100
fi
- sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$progress_percent%\">$progress_percent%</div>|g" "$progress_page"
+ sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${progress_percent}%\">${progress_percent}%</div>|g" "$progress_page"
}
function update_restore_progress_bar {
@@ -904,7 +904,7 @@ function update_restore_progress_bar {
if [ $progress_percent -gt 100 ]; then
progress_percent=100
fi
- sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$progress_percent%\">$progress_percent%</div>|g" "$progress_page"
+ sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${progress_percent}%\">${progress_percent}%</div>|g" "$progress_page"
}
function update_format_progress_bar {
@@ -933,7 +933,7 @@ function update_format_progress_bar {
if [ $progress_percent -gt 100 ]; then
progress_percent=100
fi
- sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:$progress_percent%\">$progress_percent%</div>|g" "$progress_page"
+ sed -i "s|<div class=\"w3-container.*|<div class=\"w3-container w3-blue w3-round-xlarge\" style=\"width:${progress_percent}%\">${progress_percent}%</div>|g" "$progress_page"
}
function backup_and_restore {
@@ -1367,7 +1367,7 @@ function update_system_monitor {
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"
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"
+ 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"
chown www-data:www-data "$webadmin_install_dir/system_monitor.html"
fi
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 30f88d7e0..b64a533f9 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -714,7 +714,7 @@ function webadmin_update_system_monitor {
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"
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"
+ 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"
chown www-data:www-data "$webadmin_install_dir/system_monitor.html"
fi
--
GitLab