From d9bd71900867e01c068d8ba5826ad8c6d15ddee5 Mon Sep 17 00:00:00 2001
From: Anonymous_Z <zhangrui182@huawei.com>
Date: Tue, 3 Mar 2020 14:42:04 +0800
Subject: [PATCH] fix welcome information

---
 generic-release-1.0/.system-info.sh.swp | Bin 0 -> 12288 bytes
 generic-release-1.0/system-info.sh      |  16 ++++++++++++++--
 generic-release.spec                    |   5 ++++-
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 generic-release-1.0/.system-info.sh.swp

diff --git a/generic-release-1.0/.system-info.sh.swp b/generic-release-1.0/.system-info.sh.swp
new file mode 100644
index 0000000000000000000000000000000000000000..e06bc8a10c70057be89d4502ec29d02e2336b0cd
GIT binary patch
literal 12288
zcmeI2O>Y}T7{{kbNR(1Qlp{qCj-w_e>$T(3(v~2($(k(0FS6GSRZXqQ?$}=N?pXU0
zH?#ph00_PZcO<yM6^<O>)*Djk34{=w_>W&wCq*sSqH*-s&dl@7Gtc~Hc4RBFlfP<L
z=tAxs!{>R%hJUtiMC@g@++-}0GEvQs`Up2RggCcj<n#I09^!2FWgtwCC*0(r4EF+=
z#+?sMITWFl4n$-`Vjy@d%$^8E<h!%FQOM=ZcrQ*wVEAEI=HmWCM$slsKofX?K$>)o
z*H5;JtA)I>Eo5GyQ!lh0aMKN%fF_^`XabsmCZGvu0-As(@c$){43DvoF})|IQ@lKV
z9y{`!R`o*@&;&FAO+XXS1T+CnKoigeGyzRO6VL=6Ljv4mEPaZx{o_a;|No!;{{Q1S
z#=eC<h0a4KpgYep_7QX%ItBfDlCitc9q0$>d+0mpGpGz%&;{uCXBhhpx(j^+eGPpH
z-G**KL#PAYfVQDBWI-39)6h%Mi_qUE82byl2YmtEghtT&(A&@{=%=R{`wIFT3ZWYG
zD)c0D4|Dtl`WgBW`UD!!`!QTMow6pN31|YEfF_^`Jf;M?K07Ylz9d6X#*q}IA#rkL
z5b)3=9uxNhKlI}y;)#rw(pW^)&Zujd?acBDs;I@OC+Ur8pEui?T!x83Ean2Y!wgIM
zB4mD-u2UvE>Pw#onYFcXqzt{s4svK=gqUPF@I!Hl+DTRo*$LA?#W?V?>qyLtL>!NO
z{9$KWo%3nMyeFs@PNSeAyL0B|hz|+Dy|Fz;trLh~&Y>a#8SUM7ffe;ms>05>)g$R5
z4>8GPIIGQhG{^TwX(0J{taiRwyq>>YEM7jB53;JY!*@l5s1wV44%4pc%4rnv#Ftnd
z(CJd*2NOK1&~ek~5T0!@z;XymBxOgF@*%sbu=~)~vbRtfMq<%CyRX_&T+1$*@s1yw
z{*d_XUL=Nu6-g!~W0wl67jk+06%JaI`8?ewKKg*p+!{uHm{4|g{|uV?f_r2Xme~T?
z2sc?deCwYsEyhyC7@i}SjFIwdsRn#8pYepx5W6wGIdvK+rvvtk%{agh*L#JsIzWT3
z=i|MGW)yhfE5r6?jch7a7@MaLmqV!+kh-bHH<cIP?WwMFYpL=dZz?rpmyAA{v)P+%
z)1(=KrD_>d-#??ekM|^Fv)zWC-AD*Bf`guFTV6tE8UySuWfqIMLU(a7vqIUTnO!|w
z$mgfQ#yfbjD;b;Lo&ORRoB2OQorXzd!UvBIlU<#rg7A1Z0DH38&@&A=HlPuWc~4q#
z<+F*&;vk?(I^ZGIn_IM7Ana{IcR`*=xIc(<Y@yz2)N4%(CA(7JvaO93va9P`tqr^S
z7F}sMRINF*Wmjy++90QfYSpl-<p#`F#i}|hRIwWCo29B#x?*qH&NZqvsBAk_#<N8A
zQp2&=TU(_DTW~h*CN*niXS>v}2<3XCcGccM+**}NRmzl_XwA@-Qqyj((6;St){p?a
z8whV(O{$gQca7e$t4Py=-D;5aZoOeOVZ#WdKK&%Yx|##u6=5uLu8iG5PDZ_)8=7Mp
zfWa27$&>=VM{)-wCMWR_weDeHJh?P+bpa7?4v_jW#j=}>I52Y8m67L%J@x)8+KGq)
zygNA1T^V}5Iz}dk$dQ!*?j!f!32~<>dz6MAPXD9JhfeEqxEJ}oenLy`GF@NI7cRa>
in<*a&pB$Xop&ZDbFJfAkxfR+<JoGWu*|NiNkNzL`3{{-~

literal 0
HcmV?d00001

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
index 73db14e..7dd02ac 100644
--- a/generic-release-1.0/system-info.sh
+++ b/generic-release-1.0/system-info.sh
@@ -13,10 +13,22 @@
 welcome=$(uname -r)
 
 # Memory
-memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}')
+memory_total=$(free -m | awk '/Mem:/ { printf($2)}')
+if [ $memory_total -gt 0 ]
+then
+    memory_usage=$(free -m | awk '/Mem:/ { printf("%3.1f%%", $3/$2*100)}')
+else
+    memory_usage=0.0%
+fi
 
 # Swap memory
-swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}')
+swap_total=$(free -m | awk '/Swap:/ { printf($2)}')
+if [ $swap_total -gt 0 ]
+then
+    swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}')
+else
+    swap_mem=0.0%
+fi
 
 # Usage
 usageof=$(df -h / | awk '/\// {print $(NF-1)}')
diff --git a/generic-release.spec b/generic-release.spec
index b1a30b3..b77c7ef 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -5,7 +5,7 @@
 %define dist_release_version 8
 %define generic_version 1.0
 %define generic_patch_level %{nil}
-%define generic_release 22
+%define generic_release 23
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -117,6 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/eula/eula.*
 
 %changelog
+* Tue Mar 3 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.0-23
+- fix welcome information
+
 * Tue Jan 7 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.0-22
 - fix welcome information
 
-- 
Gitee