Z991239-5349 #comment UOS安装脚本优化

addin/packaging/UOS/install.sh

@@ -4,7 +4,32 @@ MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
 
+function set-title() {
+    if [[ -z "$ORIG" ]]; then
+        ORIG=$PS1
+    fi
+    TITLE="\[\e]2;$*\a\]"
+    PS1=${ORIG}${TITLE}
+}
+set-title 【可视柜台应用程序安装脚本】
+clear
+
+installType=0
+argument1=
+if [ $# -eq 1 ];then
+    echo has arguments: $*
+	argument1=$(echo $1 | awk '{ print tolower($0) }' )
+    if [ "$argument1" = "uninstall" ]; then
+        installType=4
+    elif [ "$argument1" = "pure" ]; then
+        installType=1
+    fi
+else
+    echo no any arguments.
+fi
 echo "[RVCTermianal] === Install Start === "
+echo 安装脚本模式: $installType
+
 curr_timestamp=`date "+%Y%m%d-%H%M%S.%3N"`
 lightdm_file=/etc/lightdm/lightdm.conf
 rvc_pkg_rvc=${MY_PATH}/rvc
@@ -115,14 +140,6 @@ if [ $(id -u) != 0 ]; then
     exit 0
 fi
 
-argument1=
-if [ $# -eq 1 ];then
-    echo has arguments: $*
-	argument1=$(echo $1 | awk '{ print tolower($0) }' )
-else
-    echo no any arguments.
-fi
-
 #获取当前登录的用户名称，这里可以考虑用另外一种优化的方法
 rvc_user=$USER
 if [ -z "$rvc_user" -o "$rvc_user" = "root" ]; then
@@ -155,7 +172,7 @@ if [ -z "$rvc_user" -o "$rvc_user" = "root" ]; then
 	rvc_user=$name
 fi
 
-if [ "$argument1" = "uninstall" ]; then
+if [ $installType -eq 4 ]; then
 	rm /etc/xdg/autostart/spexplorerauto.desktop > /dev/null 2>&1
     rm /usr/share/applications/spexplorerauto.desktop > /dev/null 2>&1
     rm -rf /opt/rvc > /dev/null 2>&1
@@ -170,8 +187,8 @@ if [ "$argument1" = "uninstall" ]; then
     papers_bak_dir=/usr/share/wallpapers/deepin_bak
     if [ -d $papers_bak_dir ]; then
         rm -rf $papers_dir/*  > /dev/null 2>&1
-        cp $papers_bak_dir/* $papers_dir
-		rm -rf $papers_bak_dir
+        cp $papers_bak_dir/* $papers_dir > /dev/null 2>&1
+		rm -rf $papers_bak_dir > /dev/null 2>&1
     fi
 	
     if [ -z "$rvc_user" ]; then
@@ -182,6 +199,11 @@ if [ "$argument1" = "uninstall" ]; then
 	    exit 2
     fi
     rm /home/$rvc_user/Desktop/spexplorerauto.desktop > /dev/null 2>&1
+
+    sudo chmod +x /usr/bin/dde-desktop
+    sudo chmod +x /usr/bin/dde-dock
+
+    echo -e "\033[42;37m [INFO]: === 所有安装步骤执行成功，正常退出=== \033[0m"
 	exit 0
 fi
 
@@ -327,6 +349,11 @@ if [ $res -eq 0 ]; then
 	cp ${rvc_pkg_rvc}/Resources/spexplorerauto.desktop /etc/xdg/autostart/
 	echo "[INFO]: Copy application icon to desktop..."
 	cp ${rvc_pkg_rvc}/Resources/spexplorerauto.desktop /home/$rvc_user/Desktop
+
+    if [ $installType -eq 1 ]; then
+        sudo chmod -x /usr/bin/dde-desktop
+        sudo chmod -x /usr/bin/dde-dock
+    fi
 else
     echo -e "\033[41;37m [ERROR]: 设置SUDO权限失败！！ \033[0m"
 	exit 1

addin/packaging/UOS/spexplorerauto.target

@@ -0,0 +1,21 @@
+#  SPDX-License-Identifier: LGPL-2.1+
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=RVC Terminal Application AutoStart
+
+[Service]
+Type=simple
+ExecStart=/opt/Run/version/sudo_spexplorer.sh
+Restart=always
+
+[Install]
+WantedBy=default.target
+
+#systemctl --user enable spexplorerauto