You need to sign in or sign up before continuing.
Commit f75f60c6 authored by Vitaly Lipatov's avatar Vitaly Lipatov

remove old kdialog patch

parent d4a95427
From 066a2334ebc6fb608825949d7c642b1441bc403a Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Mon, 23 May 2022 21:37:20 +0300
Subject: [PATCH] fix detection for --gui without args
---
src/winetricks | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/winetricks b/src/winetricks
index cd2a344bb..2ede77ceb 100755
--- a/src/winetricks
+++ b/src/winetricks
@@ -3271,11 +3271,13 @@ winetricks_early_wine_arch()
winetricks_detect_gui()
{
- if [ -n "$1" ]; then
- if [ "$1" = "kdialog" ] && test -x "$(command -v kdialog 2>/dev/null)"; then
+ if [ "$1" = "--gui" ] && [ -n "$2" ] ; then
+ if [ "$2" = "kdialog" ] ; then
+ test -x "$(command -v kdialog 2>/dev/null)" || w_die "--gui kdialog is forced, but kdialog command is missed."
WINETRICKS_GUI=kdialog
WINETRICKS_GUI_VERSION="$(kdialog --version)"
- elif [ "$1" = "zenity" ] || [ "$1" = "--gui" ] && test -x "$(command -v zenity 2>/dev/null)"; then
+ elif [ "$2" = "zenity" ] ; then
+ test -x "$(command -v zenity 2>/dev/null)" || w_die "--gui zenity is forced, but zenity command is missed."
WINETRICKS_GUI=zenity
WINETRICKS_GUI_VERSION="$(zenity --version)"
WINETRICKS_MENU_HEIGHT=500
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment