Эх сурвалжийг харах

#IQRV #comment UOS安装脚本优化

80374374 1 жил өмнө
parent
commit
ef41408417

+ 1 - 41
addin/packaging/UOS/installsub.in

@@ -186,37 +186,6 @@ fi
 
 echo [INFO] 获取当前登录的用户名OK! 用户名:$rvc_user
 
-#卸载操作
-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
-    rm -rf /opt/Run > /dev/null 2>&1
-    rm -rf /opt/wlog > /dev/null 2>&1
-
-    echo "[INFO] set menu tool as show mode..."
-    gsettings set com.deepin.dde.dock hide-mode  keep-showing
-    echo "[INFO] set menu tool as show mode done!"
-	
-	papers_dir=/usr/share/wallpapers/deepin
-    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 > /dev/null 2>&1
-		rm -rf $papers_bak_dir > /dev/null 2>&1
-    fi
-    rm /home/$rvc_user/Desktop/spexplorerauto.desktop > /dev/null 2>&1
-
-    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
-	
-    echo -e "\033[42;37m [INFO] === 所有安装步骤执行成功,正常退出=== \033[0m"
-    exit 0
-fi
-
 # 如果版本中有root.ini,移除测试的root.ini文件
 if [ -f ${MY_PATH}/Run/hardwarecfg/root.ini ]; then
 	sudo rm ${MY_PATH}/Run/hardwarecfg/root.ini
@@ -262,7 +231,7 @@ sudo chmod a+rw ${rvc_install_path_versions_dir}
 sudo chmod a+rw ${rvc_install_path_Run_dir}
 echo [INFO] 赋予应用相关文件执行权限OK!
 
-echo 【2/3】拷贝系统桌面壁纸
+echo 【2/3】拷贝系统桌面壁纸,用于后续安装
 
 papers_dir=/usr/share/wallpapers/deepin
 papers_bak_dir=/usr/share/wallpapers/deepin_bak
@@ -324,15 +293,6 @@ cp ${rvc_pkg_rvc}/Resources/spexplorerauto.desktop /home/$rvc_user/Desktop
 
 echo 【4/4】设置可视柜台应用程序开机自启动OK!
 
-#暂未商定结论,暂时不黑屏UOS
-if [ $installType -eq 5 ]; 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
-fi
-
 #去掉密钥环,之前出现过这种问题,统信指示移除该文件即可
 keyring_file=/home/$rvc_user/.local/share/keyrings/login.keyring
 if [ -f "$keyring_file" ]; then

+ 1 - 50
addin/packaging/UOS/original.sh

@@ -198,37 +198,6 @@ fi
 
 echo [INFO] 获取当前登录的用户名OK! 用户名:$rvc_user
 
-#卸载操作
-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
-    rm -rf /opt/Run > /dev/null 2>&1
-    rm -rf /opt/wlog > /dev/null 2>&1
-
-    echo "[INFO] set menu tool as show mode..."
-    gsettings set com.deepin.dde.dock hide-mode  keep-showing
-    echo "[INFO] set menu tool as show mode done!"
-	
-	papers_dir=/usr/share/wallpapers/deepin
-    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 > /dev/null 2>&1
-		rm -rf $papers_bak_dir > /dev/null 2>&1
-    fi
-    rm /home/$rvc_user/Desktop/spexplorerauto.desktop > /dev/null 2>&1
-
-    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
-	
-    echo -e "\033[42;37m [INFO] === 所有安装步骤执行成功,正常退出=== \033[0m"
-    exit 0
-fi
-
 # 如果版本中有root.ini,移除测试的root.ini文件
 if [ -f ${MY_PATH}/Run/hardwarecfg/root.ini ]; then
 	sudo rm ${MY_PATH}/Run/hardwarecfg/root.ini
@@ -237,15 +206,6 @@ if [ -d ${MY_PATH}/Run/runinfo ]; then
 	sudo rm -rf ${MY_PATH}/Run/runinfo
 fi
 
-if [ -f $rvc_install_path_hardware_dir/root.ini ]; then
-    echo [WARN] 存在root.ini文件,认为是存量安装,跳过版本清理操作
-else
-	echo [INFO] 清理(删除)历史版本(如有)......
-    sudo rm -rf ${rvc_install_path_Run_dir} > /dev/null 2>&1
-    sudo rm -rf ${rvc_install_path_rvc_dir} > /dev/null 2>&1
-	echo [INFO] 清理(删除)历史版本(如有)OK!
-fi
-
 echo 【0/1】拷贝RVC目录...
 if [ ! -d $rvc_install_path_rvc_dir ]; then
     sudo mkdir -p ${rvc_install_path_rvc_dir}
@@ -283,7 +243,7 @@ sudo chmod a+rw ${rvc_install_path_versions_dir}
 sudo chmod a+rw ${rvc_install_path_Run_dir}
 echo [INFO] 赋予应用相关文件执行权限OK!
 
-echo 【2/3】拷贝系统桌面壁纸
+echo 【2/3】拷贝系统桌面壁纸,用于后续安装
 
 papers_dir=/usr/share/wallpapers/deepin
 papers_bak_dir=/usr/share/wallpapers/deepin_bak
@@ -345,15 +305,6 @@ cp ${rvc_pkg_rvc}/Resources/spexplorerauto.desktop /home/$rvc_user/Desktop
 
 echo 【4/4】设置可视柜台应用程序开机自启动OK!
 
-#暂未商定结论,暂时不黑屏UOS
-if [ $installType -eq 5 ]; 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
-fi
-
 #去掉密钥环,之前出现过这种问题,统信指示移除该文件即可
 keyring_file=/home/$rvc_user/.local/share/keyrings/login.keyring
 if [ -f "$keyring_file" ]; then