!3 fix welcome

Merge pull request !3 from Anonymous_Z/anonymous_z

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)}')

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