Merge pull request #26 from essentialkaos/develop

Version 1.5.0
essentialkaos · Dec 25, 2016 · 265c038 · 265c038
2 parents 212efd2 + 97887de
commit 265c038
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 218 deletions.
diff --git a/SOURCES/nodeinfo b/SOURCES/nodeinfo
@@ -3,7 +3,7 @@
 ###############################################################################
 
 APP="RPMBuilder Node Info Viewer"
-VER="1.0.0"
+VER="1.0.1"
 
 ###############################################################################
 
@@ -19,13 +19,12 @@ main() {
   pkg_ver=$(getNodePackageVersion)
 
   echo ""
-  echo "  CPU:      $cpu_model ($proc_num)"
-  echo "  Memory:   $mem_usage"
-  echo "  Swap:     $swap_usage"
-  echo "  OS:       $os_version"
-  echo "  Kernel:   $kernel"
-  echo "  Package:  $pkg_ver"
-  echo ""
+  echo "  CPU:      ${cpu_model:--} (${proc_num:--})"
+  echo "  Memory:   ${mem_usage:--}"
+  echo "  Swap:     ${swap_usage:--}"
+  echo "  OS:       ${os_version:--}"
+  echo "  Kernel:   ${kernel:--}"
+  echo "  Package:  ${pkg_ver:--}"
 }
 
 getProcNum() {