From 5882cd0c436e120b57e447d7c9fa6a42021b0737 Mon Sep 17 00:00:00 2001
From: ctyunsystem <ctyuncommiter05@chinatelecom.cn>
Date: Thu, 25 Aug 2022 17:04:54 +0800
Subject: [PATCH] Remove the script system-info.sh, greatly improve the login
 speed

---
 generic-release-1.0/system-info.sh | 86 ------------------------------
 generic-release.spec               |  7 +--
 2 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 generic-release-1.0/system-info.sh

diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh
deleted file mode 100644
index 182368b..0000000
--- a/generic-release-1.0/system-info.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#/bin/bash
-#Copyright (c) [2019] Huawei Technologies Co., Ltd.
-#generic-release is licensed under the Mulan PSL v2.
-#You can use this software according to the terms and conditions of the Mulan PSL v2.
-#You may obtain a copy of Mulan PSL v2 at:
-#     http://license.coscl.org.cn/MulanPSL2
-#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
-#PURPOSE.
-#See the Mulan PSL v2 for more details.
-
-# Welcome
-welcome=$(uname -r)
-
-# Memory
-memory_total=$(cat /proc/meminfo | awk '/^MemTotal:/ {printf($2)}')
-memory_free=$(cat /proc/meminfo | awk '/^MemFree:/ { printf($2)}')
-buffers=$(cat /proc/meminfo | awk '/^Buffers:/ { printf($2)}')
-cached=$(cat /proc/meminfo | awk '/^Cached:/ { printf($2)}')
-sreclaimable=$(cat /proc/meminfo | awk '/^SReclaimable:/ { printf($2)}')
-swap_total=$(cat /proc/meminfo | awk '/^SwapTotal:/ { printf($2)}')
-swap_free=$(cat /proc/meminfo | awk '/^SwapFree:/ { printf($2)}')
-
-if [[ $memory_total -gt 0 ]]
-then
-    memory_usage=`echo "scale=1; ($memory_total - $memory_free - $buffers - $cached - $sreclaimable) * 100.0 / $memory_total" |bc`
-    memory_usage="${memory_usage}%"
-else
-    memory_usage=0.0%
-fi
-
-# Swap memory
-if [[ $swap_total -gt 0 ]]
-then
-    swap_mem=`echo "scale=1; ($swap_total - $swap_free) * 100.0 / $swap_total" |bc`
-    swap_mem="${swap_mem}%"
-else
-    swap_mem=0.0%
-fi
-
-# Usage
-usageof=$(df -h / | awk '/\// {print $(NF-1)}')
-
-# System load
-load_average=$(awk '{print $1}' /proc/loadavg)
-
-# WHO I AM
-whoiam=$(whoami)
-
-# Time
-time_cur=$(date)
-
-# Processes
-processes=$(ps aux | wc -l)
-
-# Users
-user_num=$(users | wc -w)
-
-# Ip address
-ip_pre=""
-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
-
-echo -e "\n"
-echo -e "Welcome to $welcome\n"
-echo -e "System information as of time: \t$time_cur\n"
-echo -e "System load: \t\033[0;33;40m$load_average\033[0m"
-echo -e "Processes: \t$processes"
-echo -e "Memory used: \t$memory_usage"
-echo -e "Swap used: \t$swap_mem"
-echo -e "Usage On: \t$usageof"
-for line in $ip_pre
-do
-	    ip_address=${line%/*}
-	    echo -e "IP address: \t$ip_address"
-done
-echo -e "Users online: \t$user_num"
-if [ "$whoiam" == "root" ]
-then
-	echo -e "\n"
-else
-	echo -e "To run a command as administrator(user \"root\"),use \"sudo <command>\"."
-fi
-
diff --git a/generic-release.spec b/generic-release.spec
index d0f55b3..13ffe67 100644
--- a/generic-release.spec
+++ b/generic-release.spec
@@ -6,7 +6,7 @@
 %define generic_version 20.03
 %define generic_patch_level LTS
 %define generic_patch_level_extend SP1
-%define generic_release 47
+%define generic_release 48
 %define builtin_release_version 1.0
 
 %define current_arch %{_arch}
@@ -69,7 +69,6 @@ EOF
 
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/profile.d
 cp -a color.sh $RPM_BUILD_ROOT/etc/profile.d/
-cp -a system-info.sh $RPM_BUILD_ROOT/etc/profile.d/
 cp -a performance.sh $RPM_BUILD_ROOT/etc/profile.d/
 
 # write cpe to /etc/system/release-cpe
@@ -119,7 +118,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,0755)
 /etc/system-release
 /etc/profile.d/color.sh
-/etc/profile.d/system-info.sh
 /etc/%{product_family}-release
 %config(noreplace) /etc/os-release
 %config /etc/system-release-cpe 
@@ -137,6 +135,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/performance.sh
 
 %changelog
+* Mon Aug 22 2022 yiengyou <ctyuncommiter05@chinatelecom.cn> - 1.0-48
+- Remove the script system-info.sh, greatly improve the login speed
+
 * Tue Dec 21 2021 gaochong <gaochong@uniontech.com> - 1.0-47
 - get memeroy info from /proc/meminfo instead of command free
 
-- 
Gitee