#IQRV #comment 前置杀死进程的逻辑

addin/packaging/UOS/installsh.in

@@ -128,6 +128,14 @@ if [ $(id -u) != 0 ]; then
     exit 0
 fi
 
+echo "to clear the rvc terminal processes..."
+killall -9 spshell > /dev/null 2>&1
+killall -9 sphost > /dev/null 2>&1
+killall -9 guardian > /dev/null 2>&1
+killall -9 uosbrowser > /dev/null 2>&1
+killall -9 browser > /dev/null 2>&1
+killall -s 9 `ps -aux | grep browser | awk '{print $2}'` > /dev/null 2>&1
+
 #获取当前登录的用户名称，这里可以考虑用另外一种优化的方法
 rvc_user=$USER
 if [ -z "$rvc_user" -o "$rvc_user" = "root" ]; then
@@ -198,14 +206,6 @@ if [ $installType -eq 4 ]; then
 	exit 0
 fi
 
-echo "to clear the rvc terminal processes..."
-killall -9 spshell > /dev/null 2>&1
-killall -9 sphost > /dev/null 2>&1
-killall -9 guardian > /dev/null 2>&1
-killall -9 uosbrowser > /dev/null 2>&1
-killall -9 browser > /dev/null 2>&1
-killall -s 9 `ps -aux | grep browser | awk '{print $2}'` > /dev/null 2>&1
-
 echo "============== previous installation custom scripts start =============="
 user1=$(ps -o user= -p $$ | awk '{print $1}')
 echo "user1: $user1"
@@ -343,10 +343,10 @@ if [ $res -eq 0 ]; then
 
     if [ $installType -eq 1 ]; then
         echo [INFO]去除桌面组件应用程序的执行权限，实现开机黑屏
-	sudo chmod -x /usr/bin/dde-desktop
-	sudo chmod -x /usr/bin/dde-dock
-	sudo chmod -x /usr/bin/dde-launcher
-	sudo chmod -x /usr/bin/dde-file-manager
+        sudo chmod -x /usr/bin/dde-desktop
+        sudo chmod -x /usr/bin/dde-dock
+        sudo chmod -x /usr/bin/dde-launcher
+        sudo chmod -x /usr/bin/dde-file-manager
     fi
 else
     echo -e "\033[41;37m [ERROR]: 设置SUDO权限失败！！ \033[0m"

addin/packaging/UOS/original.sh

@@ -140,6 +140,14 @@ if [ $(id -u) != 0 ]; then
     exit 0
 fi
 
+echo "to clear the rvc terminal processes..."
+killall -9 spshell > /dev/null 2>&1
+killall -9 sphost > /dev/null 2>&1
+killall -9 guardian > /dev/null 2>&1
+killall -9 uosbrowser > /dev/null 2>&1
+killall -9 browser > /dev/null 2>&1
+killall -s 9 `ps -aux | grep browser | awk '{print $2}'` > /dev/null 2>&1
+
 #获取当前登录的用户名称，这里可以考虑用另外一种优化的方法
 rvc_user=$USER
 if [ -z "$rvc_user" -o "$rvc_user" = "root" ]; then
@@ -210,14 +218,6 @@ if [ $installType -eq 4 ]; then
 	exit 0
 fi
 
-echo "to clear the rvc terminal processes..."
-killall -9 spshell > /dev/null 2>&1
-killall -9 sphost > /dev/null 2>&1
-killall -9 guardian > /dev/null 2>&1
-killall -9 uosbrowser > /dev/null 2>&1
-killall -9 browser > /dev/null 2>&1
-killall -s 9 `ps -aux | grep browser | awk '{print $2}'` > /dev/null 2>&1
-
 echo "============== previous installation custom scripts start =============="
 user1=$(ps -o user= -p $$ | awk '{print $1}')
 echo "user1: $user1"
@@ -355,10 +355,10 @@ if [ $res -eq 0 ]; then
 
     if [ $installType -eq 1 ]; then
         echo [INFO]去除桌面组件应用程序的执行权限，实现开机黑屏
-	sudo chmod -x /usr/bin/dde-desktop
-	sudo chmod -x /usr/bin/dde-dock
-	sudo chmod -x /usr/bin/dde-launcher
-	sudo chmod -x /usr/bin/dde-file-manager
+        sudo chmod -x /usr/bin/dde-desktop
+        sudo chmod -x /usr/bin/dde-dock
+        sudo chmod -x /usr/bin/dde-launcher
+        sudo chmod -x /usr/bin/dde-file-manager
     fi
 else
     echo -e "\033[41;37m [ERROR]: 设置SUDO权限失败！！ \033[0m"