fix: Can not pass args that starts with -- && feat: Now add --uri %u as default

Merge pull request  from shenmo/main
This commit is contained in:
gfdgd xi 2024-11-05 13:27:29 +00:00 committed by Gitee
commit 624b4c8b3a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
13 changed files with 17 additions and 17 deletions

@ -18,7 +18,7 @@ Depends: python3,
python3-requests,
python3-pyqt5 | pyqt5,
python3-psutil | pypsutil,
xfce4-terminal | gxde-terminal | deepin-terminal | mate-terminal | gnome-terminal,
gxde-terminal |xfce4-terminal | deepin-terminal | mate-terminal | gnome-terminal,
python3-dbus,
python3-pip | pip, p7zip-full | p7zip-legacy | p7zip,
sudo,

@ -4,7 +4,7 @@ X-Categories=System;Wine;
Exec=/usr/bin/deepin-wine-package-builder "~/.wine" %F
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder
Name[zh]=Wine
Name[zh_CN]=Wine
Terminal=false
StartupNotify=true
NoDisplay=true

@ -4,7 +4,7 @@ X-Categories=System;Wine;
Exec=/usr/bin/deepin-wine-packager-easy-builder %F
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder
Name[zh]=Wine
Name[zh_CN]=Wine
Terminal=false
StartupNotify=true
NoDisplay=true

@ -5,6 +5,6 @@ Exec=/usr/bin/deepin-wine-packager-with-script
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Package Builder For UOS
NoDisplay=true
Name[zh]=Wine ()
Name[zh_CN]=Wine ()
Terminal=false
StartupNotify=true

@ -4,7 +4,7 @@ X-Categories=System;Wine;
Exec=/opt/apps/deepin-wine-runner/RunVM.sh %F
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Setting VirtualMachine
Name[zh]= Windows
Name[zh_CN]= Windows
NoDisplay=true
Terminal=false
StartupNotify=true

@ -4,6 +4,6 @@ X-Categories=System;
Exec=/opt/apps/deepin-wine-runner/StartVM.sh %F
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Start Windows VirtualMachine
Name[zh]= Windows
Name[zh_CN]= Windows
Terminal=false
StartupNotify=true

@ -4,7 +4,7 @@ X-Categories=System;Wine;
Exec=/usr/bin/deepin-wine-runner %F
Icon=/opt/apps/deepin-wine-runner/deepin-wine-runner.svg
Name=Wine Runner
Name[zh]=Wine
Name[zh_CN]=Wine
Terminal=false
StartupNotify=true
Keywords=exe;scr;

@ -305,7 +305,7 @@ if [ -n "$EXEC_PATH" ];then
if [ -z "${{EXEC_PATH##*.lnk*}}" ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
else
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
$START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
fi
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"
@ -321,7 +321,7 @@ Encoding=UTF-8
Type=Application
X-Created-By=@@@Maintainer@@@
Icon=@@@Icon@@@
Exec="/opt/apps/@@@Package@@@/files/run.sh"
Exec="/opt/apps/@@@Package@@@/files/run.sh --uri %u"
Name=@@@Name@@@
Comment=@@@Description@@@
MimeType=

@ -620,7 +620,7 @@ Description: {e3_text.text()}
if iconUiList[0][2].text().replace(" ", "") == "":
command = f"--uri {iconUiList[0][2].text()}"
else:
command = iconUiList[0][2].text()
command = f"--uri {iconUiList[0][2].text()}" # 若要传参进入wine容器必须--uri否则是传给run.sh的
replaceMap = [
["@@@BOTTLENAME@@@", e5_text.text()],
["@@@APPVER@@@", e2_text.text()],
@ -636,7 +636,7 @@ Description: {e3_text.text()}
["@@@MAINTAINER@@@", e4_text.text()],
["@@@DESCRIPTION@@@", e3_text.text()],
["@@@DESKTOP_EXEC@@@",
f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command}'''],
f'''"/opt/apps/{e1_text.text()}/files/run.sh" {command} %u'''],
["@@@DESKTOP_NAME@@@", iconUiList[0][3].text()],
["@@@DESKTOP_MIMETYPE@@@", iconUiList[0][5].text()],
["@@@DESKTOP_CATEGORIES@@@", iconUiList[0][1].currentText()]

@ -1,5 +1,5 @@
{
"Version": "4.1.1.1",
"Version": "4.1.1.2",
"Time": "未知",
"Thank": [
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000新世界的测试机器",

@ -1,5 +1,5 @@
{
"Version": "4.1.1.0",
"Version": "4.1.1.2",
"Time": "未知",
"Thank": [
"感谢 @り哥拽的冇气质° 和 @杨 提供了 3a5000新世界的测试机器",

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Copyright (C) 2016 Deepin, Inc.
#
@ -109,7 +109,7 @@ if [ -n "$EXEC_PATH" ];then
if [ -z "${EXEC_PATH##*.lnk*}" ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
else
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
$START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
fi
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# Copyright (C) 2016 Deepin, Inc.
#
@ -156,7 +156,7 @@ if [ -n "$EXEC_PATH" ];then
if [ -z "${EXEC_PATH##*.lnk*}" ];then
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
else
$START_SHELL_PATH $BOTTLENAME $APPVER "C:/windows/command/start.exe" "/Unix" "$EXEC_PATH" "$@"
$START_SHELL_PATH $BOTTLENAME $APPVER "$EXEC_PATH" "$@"
fi
else
$START_SHELL_PATH $BOTTLENAME $APPVER "uninstaller.exe" "$@"