diff --git a/VM-source/qemu.cpp b/VM-source/qemu.cpp index 6a96867..0d2349c 100644 --- a/VM-source/qemu.cpp +++ b/VM-source/qemu.cpp @@ -331,7 +331,7 @@ QString qemu::GetArch() process.start("uname", QStringList() << "-m"); process.waitForStarted(); process.waitForFinished(); - QString data = process.readAllStandardError(); + QString data = process.readAllStandardOutput(); process.close(); return data.replace("\n", "").replace(" ", ""); } diff --git a/deepin-wine-easy-packager.py b/deepin-wine-easy-packager.py index 7e83434..5154618 100755 --- a/deepin-wine-easy-packager.py +++ b/deepin-wine-easy-packager.py @@ -549,7 +549,7 @@ class RunThread(QtCore.QThread): self.RunCommand(f"cp -rv '{folderExePath}' '{bottlePath}/drive_c/Program Files'") debPackageVersion = self.GetEXEVersion(exePath.text(), bottlePath) debDescription = f"{exeName} By Build By Wine Runner Easy Packager" - debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei" + debDepends = f"{chooseWine} | {chooseWine}-bcm | {chooseWine}-dcm | com.{chooseWine}.deepin, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei" self.RunCommand(f"mkdir -pv '{debBuildPath}/DEBIAN'") self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/files'") self.RunCommand(f"mkdir -pv '{debBuildPath}/opt/apps/{debPackageName}/entries/applications'") diff --git a/deepin-wine-packager.py b/deepin-wine-packager.py index 7c95c14..d3c3d26 100755 --- a/deepin-wine-packager.py +++ b/deepin-wine-packager.py @@ -1846,8 +1846,8 @@ def BrowserHelperConfigPathText(): def ChangeWine(): useInstallWineArch.setEnabled(os.path.exists(wine[wineVersion.currentText()])) - debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei", - f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei" + debDepends.setText([f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, deepin-wine-helper | com.wine-helper.deepin, fonts-wqy-microhei, fonts-wqy-zenhei", + f"{wine[wineVersion.currentText()]} | {wine[wineVersion.currentText()]}-bcm | {wine[wineVersion.currentText()]}-dcm | com.{wine[wineVersion.currentText()]}.deepin, spark-dwine-helper | store.spark-app.spark-dwine-helper, fonts-wqy-microhei, fonts-wqy-zenhei" ][int(chooseWineHelperValue.isChecked())]) debRecommend.setText("") helperConfigPathText.setEnabled(chooseWineHelperValue.isChecked())