From fc00d1391b767f4342fcddbc6743d23aa4d36b04 Mon Sep 17 00:00:00 2001
From: gaochong <gaochong@uniontech.com>
Date: Wed, 19 Aug 2020 03:24:42 -0400
Subject: [PATCH] 'sed' filter "Mem" by line numbers instead of keywords
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Filter error when local language is not English, such as 'LANG=zh_CN.UTF-8'
An error like this "-bash: [: -gt：需要一元表达式"

Signed-off-by: gaochong <gaochong@uniontech.com>
---
 generic-release-1.0/system-info.sh | 8 ++++----
 generic-release.spec               | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index 6bfdbed..5f1f37d 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -13,19 +13,19 @@
 welcome=$(uname -r)
 
 # Memory
-memory_total=$(free -m | awk '/Mem:/ { printf($2)}')
+memory_total=$(free -m | awk 'NR==2 { printf($2)}')
 if [ $memory_total -gt 0 ]
 then
-    memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}')
+    memory_usage=$(free -m | awk 'NR==2 { printf("%3.1f%%", $3/$2*100)}')
 else
     memory_usage=0.0%
 fi
 
 # Swap memory
-swap_total=$(free -m | awk '/Swap:/ { printf($2)}')
+swap_total=$(free -m | awk 'NR==3 { printf($2)}')
 if [ $swap_total -gt 0 ]
 then
-    swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}')
+    swap_mem=$(free -m | awk 'NR==3 { printf("%3.1f%%", $3/$2*100)}')
 else
     swap_mem=0.0%
 fi
diff --git a/generic-release.spec b/generic-release.spec
index e815a73..588f9ad 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -5,7 +5,7 @@
 %define dist_release_version 8
 %define generic_version 20.03
 %define generic_patch_level LTS
-%define generic_release 39
+%define generic_release 40
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/performance.sh
 
 %changelog
+* Wed Aug 19 2020 Chong <gaochong@uniontech.com> - 1.0-40
+- modify system-info.sh to display memory information in non-English environment
+
 * Thu Aug 6 2020 zhangrui <zhangrui182@huawei.com> - 1.0-39
 - modify system-info.sh to show more ip address when login
 
-- 
Gitee