forked from pool/xdg-utils
Jiri Slaby
c89750a1ea
OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=89
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: Christophe Giboudeaux <christophe@krop.fr>
|
|
Date: Wed, 30 Oct 2019 17:11:08 +0100
|
|
Subject: xdg-terminal: don't run 'kreadconfig' if KDE_SESSION_VERSION is >= 5
|
|
Patch-mainline: not yet
|
|
References: bsc#1215384
|
|
|
|
'kreadconfig' is a KDE4 executable. The program is called 'kreadconfig5' in
|
|
KDE Frameworks 5.xx.
|
|
---
|
|
scripts/xdg-terminal.in | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
|
|
index 71d56a595cfb..bd2529cde1ad 100644
|
|
--- a/scripts/xdg-terminal.in
|
|
+++ b/scripts/xdg-terminal.in
|
|
@@ -30,7 +30,20 @@ _USAGE
|
|
|
|
terminal_kde()
|
|
{
|
|
- terminal=`kreadconfig --file kdeglobals --group General --key TerminalApplication --default konsole`
|
|
+ if [ -n "$KDE_SESSION_VERSION" ] && [ "$KDE_SESSION_VERSION" -ge 5 ]; then
|
|
+ local kreadconfig=kreadconfig$KDE_SESSION_VERSION
|
|
+ else
|
|
+ local kreadconfig=kreadconfig
|
|
+ fi
|
|
+
|
|
+ if which $kreadconfig >/dev/null 2>&1; then
|
|
+ local terminal=$($kreadconfig --file kdeglobals \
|
|
+ --group General \
|
|
+ --key TerminalApplication \
|
|
+ --default konsole)
|
|
+ else
|
|
+ exit_failure_operation_impossible "'$kreadconfig' was not found or is not executable"
|
|
+ fi
|
|
|
|
terminal_exec=`command -v $terminal`
|
|
|
|
--
|
|
2.42.0
|
|
|