diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 9f9f7e3d2f1a6f7237dec37dcdb877a1cfc5da83..b201f4ca2a63090c22c884345396f191ee4cbc5b 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -13,19 +13,17 @@ welcome=$(uname -r) # Memory -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)}') +memory_total=$(free -m | awk 'NR==2 { printf($2)}') +if [[ "$memory_total" -gt 0 ];then + 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)}') -if [ $swap_total -gt 0 ] -then - swap_mem=$(free -m | awk '/Swap:/ { printf("%3.1f%%", $3/$2*100)}') +swap_total=$(free -m | awk 'NR==3 { printf($2)}') +if [[ "$swap_total" -gt 0 ];then + swap_mem=$(free -m | awk 'NR==3 { printf("%3.1f%%", $3/$2*100)}') else swap_mem=0.0% fi @@ -50,8 +48,7 @@ user_num=$(users | wc -w) # Ip address ip_pre="" -if [ -x "/sbin/ip" ] -then +if [[ -x "/sbin/ip" ]];then ip_pre=$(/sbin/ip a | grep inet | grep -v "127.0.0.1" | grep -v inet6 | awk '{print $2}') fi @@ -69,8 +66,7 @@ do echo -e "IP address: \t$ip_address" done echo -e "Users online: \t$user_num" -if [ "$whoiam"=="root" ] -then +if [[ "$whoiam" == "root" ]];then echo -e "\n" else echo -e "To run a command as administrator(user \"root\"),use \"sudo \"." diff --git a/generic-release.spec b/generic-release.spec index 7ff41c6f34c64cd471291f73251e0b9b92d133d6..8f417000c8e7832ee2dbe9bee7e3ff9f2f4c995d 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 42 +%define generic_release 43 %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 +* Tue Feb 9 2020 chong - 1.0-43 +- Fix syntax error when local language is not English, such as 'LANG=zh_CN.UTF-8' + * Sat Dec 26 2020 fu_changjie - 1.0-42 - Use generic_version macro instead of constant value, fix issue I28WC0