浏览代码

#IQRV #comment 脚本更新

80374374 1 年之前
父节点
当前提交
231e767b51
共有 1 个文件被更改,包括 3 次插入16 次删除
  1. 3 16
      addin/packaging/UOS/original.sh

+ 3 - 16
addin/packaging/UOS/original.sh

@@ -168,11 +168,6 @@ echo "[INFO] 清理可视柜台相关进程OK!"
 #获取当前登录的用户名称,这里可以考虑用另外一种优化的方法
 
 echo [INFO] 获取当前登录的用户名
-user1=$(ps -o user= -p $$ | awk '{print $1}')
-echo "[DEBUG] user1: $user1"
-user2=$(whoami)
-echo "[DEBUG] user2: $user2"
-
 rvc_user=$USER
 if [ -z "$rvc_user" -o "$rvc_user" = "root" ]; then
 	users=$(cat /etc/passwd | awk -F: '$3>=500' | cut -f 1 -d :)
@@ -210,7 +205,6 @@ elif [ "$rvc_user" = "root" ]; then
     echo -e "\033[41;37m [ERROR] 无法获取当前用户名称(用户名无效),退出程序 \033[0m"
     exit 2
 fi
-
 echo [INFO] 获取当前登录的用户名OK! 用户名:$rvc_user
 
 echo 【0/1】拷贝RVC目录...
@@ -254,8 +248,6 @@ sudo cp -rf "$MY_PATH/Run/version" ${rvc_install_path_Run_dir}
 echo 【2/2】拷贝终端版本OK!
 
 echo [INFO] 赋予应用相关文件执行权限
-echo [DEBUG] rvc_install_path_rvc_dir=${rvc_install_path_rvc_dir}
-echo [DEBUG] ${rvc_install_path_root}/${rel_version_dir}
 sudo chmod 777 ${rvc_install_path_root}
 sudo chmod a+rw -R ${rvc_install_path_rvc_dir}
 sudo chmod a+rw -R ${rvc_install_path_hardware_dir} > /dev/null 2>&1
@@ -324,7 +316,6 @@ else
     exit 1
 fi
 echo [INFO] 设置应用自启动和桌面图标
-echo "[INFO] Copy application shortkeys to menu tools..."
 if [ ! -f "${rvc_install_path_rvc_dir}/Resources/spexplorerauto.desktop" ]; then
 	echo -e "\033[41;37m [ERROR] 自启动快捷键资源文件不存在,请检查安装包的合法性和完整性!! \033[0m"
 	exit 1
@@ -333,10 +324,11 @@ if [ ! -f "/opt/Run/version/spexplorer.sh" ]; then
 	echo -e "\033[41;37m [ERROR] 应用启动脚本文件不存在,请检查安装包的合法性和完整性!! \033[0m"
 	exit 1
 fi
+echo [DEBUG] Copy application shortkeys to menu tools...
 cp "${rvc_install_path_rvc_dir}/Resources/spexplorerauto.desktop" /usr/share/applications
-echo "[INFO] Active application icon autorun after boot..."
+echo [DEBUG] Active application icon autorun after boot...
 cp "${rvc_install_path_rvc_dir}/Resources/spexplorerauto.desktop" /etc/xdg/autostart/
-echo "[INFO] Copy application icon to desktop..."
+echo [DEBUG] Copy application icon to desktop...
 cp "${rvc_install_path_rvc_dir}/Resources/spexplorerauto.desktop" /home/$rvc_user/Desktop
 
 echo 【4/4】设置可视柜台应用程序开机自启动OK!
@@ -354,12 +346,8 @@ launcherURLDEV="http://99.12.23.78/uos/dde-launcher_5.3.0.45_arm64.zip"
 browserDownURL=${browserDownURLDEV}
 #测试环境才生效,生产环境无法确认下载链接地址
 if [ $installType -eq 0 ]; then
-	if [ "`dpkg -l | grep org.deepin.browser | awk '{print $3}'`" == "" ]; then
-		echo -e "\033[43;37m [WARN] 未安装最新的UOS浏览器,请自行下载安装UOS浏览器 \033[0m"
-	fi
 	if [ "`dpkg -l | grep libdde-file-manager`" != "" ]; then
 		currentInstallVersion=$(dpkg -l | grep libdde-file-manager | awk '{print $3}')
-		echo "[INFO] Current libdde-file-manager version: $currentInstallVersion"
 		if [ "$currentInstallVersion" = "5.2.11.2-1" ]; then
 			echo "[INFO] 已安装最新输入法补丁"
 		else
@@ -368,7 +356,6 @@ if [ $installType -eq 0 ]; then
 	fi
 	if [ "`dpkg -l | grep dde-launcher`" != "" ]; then
 		currentInstallVersion=$(dpkg -l | grep dde-launcher | awk '{print $3}')
-		echo "[INFO] Current dde-launcher version: $currentInstallVersion"
 		if [ "$currentInstallVersion" = "5.3.0.45+203445.2-1" ]; then
 			echo "[INFO] 已安装最新输入法补丁(文件启动器)"
 		else