修复一些细节错误
This commit is contained in:
parent
8d4da8c4cf
commit
fc19480aa1
1
Makefile
1
Makefile
|
@ -36,6 +36,7 @@ build:
|
|||
cp -rv pkexec/* new-deb-build/usr/share/polkit-1/actions
|
||||
cp -rv AutoShell new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
cp -rv AutoConfig.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
cp -rv Model new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
cp -rv UI new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
cp -rv ConfigLanguareRunner-help.json new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
cp -rv ConfigLanguareRunner.py new-deb-build/opt/apps/com.gitee.uengine.runner.spark/files/
|
||||
|
|
|
@ -13,7 +13,7 @@ programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
|
|||
# 优先为深度终端
|
||||
terminal = ""
|
||||
terminalList = [
|
||||
"deepin-terminal1",
|
||||
"deepin-terminal",
|
||||
"mate-terminal",
|
||||
"gnome-terminal",
|
||||
"xfce4-terminal"
|
||||
|
|
|
@ -38,6 +38,9 @@ if [ "$1" = "purge" ]; then
|
|||
if [ -d "/home/$username/.config/uengine-runner/" ]; then
|
||||
rm -rf "/home/$username/.config/uengine-runner/"
|
||||
rm -rf "/home/$username/.local/share/uengine-runner"
|
||||
rm -rf "/home/$username/.local/share/uengine-runner"
|
||||
rm -rf "/home/$username/.local/share/AutoConfig.py"
|
||||
|
||||
fi
|
||||
done
|
||||
# 清理 root 用户的配置文件
|
||||
|
|
|
@ -0,0 +1,38 @@
|
|||
import os
|
||||
import sys
|
||||
import PyQt5.QtWidgets as QtWidgets
|
||||
def OpenTerminal(command):
|
||||
if terminalEnd[terminal][1]:
|
||||
os.system(f"\"{terminal}\" \"{terminalEnd[terminal][0]}\" \"{command}\"")
|
||||
print(f"\"{terminal}\" \"{terminalEnd[terminal][0]}\" \"{command}\"")
|
||||
return
|
||||
os.system(f"\"{terminal}\" \"{terminalEnd[terminal][0]}\" {command}")
|
||||
print(f"\"{terminal}\" \"{terminalEnd[terminal][0]}\" {command}")
|
||||
programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string
|
||||
# 对终端的获取
|
||||
# 优先为深度终端
|
||||
terminal = ""
|
||||
terminalList = [
|
||||
"deepin-terminal1",
|
||||
"mate-terminal",
|
||||
"gnome-terminal",
|
||||
"xfce4-terminal"
|
||||
]
|
||||
terminalEnd = {
|
||||
f"{programPath}/../launch.sh\" \"deepin-terminal": ["-e", 0],
|
||||
"mate-terminal": ["-e", 1],
|
||||
"gnome-terminal": ["--", 0],
|
||||
"xfce4-terminal": ["-e", 1]
|
||||
}
|
||||
for i in terminalList:
|
||||
if not os.system(f"which {i}"):
|
||||
if i == "deepin-terminal":
|
||||
i = f"{programPath}/../launch.sh\" \"deepin-terminal"
|
||||
terminal = i
|
||||
break
|
||||
if terminal == "":
|
||||
print("无法识别到以下的任意一个终端")
|
||||
print(" ".join(terminalList))
|
||||
app = QtWidgets.QApplication(sys.argv)
|
||||
QtWidgets.QMessageBox.critical(None, "错误", "无法识别到以下的任意一个终端\n" + " ".join(terminalList))
|
||||
exit()
|
Loading…
Reference in New Issue