浏览代码

#IQRV #comment 优化UOS安装脚本

80374374 1 年之前
父节点
当前提交
bd1e688927
共有 2 个文件被更改,包括 3 次插入14 次删除
  1. 0 1
      addin/packaging/UOS/install.sh
  2. 3 13
      addin/packaging/UOS/installsub.in

+ 0 - 1
addin/packaging/UOS/install.sh

@@ -75,7 +75,6 @@ echo 【6/6】设置系统桌面壁纸OK!
 
 # fetch the version full path at pkg
 version_dir=$(find "${MY_PATH}/Run/version/" -maxdepth 1 -regex ".*[0-9\.]$" -type d)
-echo [DEBUG] version dir: $version_dir
 slen=${#MY_PATH}
 rel_version_dir=${version_dir:$slen+1}
 echo [DEBUG] ${rel_version_dir}

+ 3 - 13
addin/packaging/UOS/installsub.in

@@ -156,11 +156,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 :)
@@ -198,7 +193,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目录...
@@ -242,8 +236,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
@@ -312,7 +304,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
@@ -321,10 +312,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!
@@ -347,7 +339,6 @@ if [ $installType -eq 0 ]; then
 	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
@@ -356,7 +347,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