Attachment 55013 Details for Bug 44359 – Patch for more robust fallback behaviour (apply after patches for bugs 44357 and 44358)

[patch] Patch for more robust fallback behaviour (apply after patches for bugs 44357 and 44358)

more_robust_fallback_behaviour_for_xdg-terminal.patch (text/plain), 2.78 KB, created by Stephan Sokolow on 2011-12-31 17:45:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stephan Sokolow

Created: 2011-12-31 17:45:37 UTC

Size: 2.78 KB

patch

obsolete

>diff --git a/scripts/xdg-terminal.in b/scripts/xdg-terminal.in
>index 21d8309..98d966b 100644
>--- a/scripts/xdg-terminal.in
>+++ b/scripts/xdg-terminal.in
>@@ -101,36 +101,43 @@ terminal_generic()
> {
>     # if $TERM is a known non-command, use hard-coded fallbacks
>     if [ x"$TERM" = x"" ] || [ x"$TERM" = x"linux" ] || [ x"$TERM" = x"vt100" ]; then
>-        TERM=xterm
>+        TERM=urxvt:rxvt:xterm
>     fi
> 
>-    terminal_exec=`which $TERM 2>/dev/null`
>-
>-    if [ -x "$terminal_exec" ]; then
>-        if [ x"$1" = x"" ]; then
>-            $terminal_exec
>-        else
>-            # screen and urxvt won't do their own parsing of quoted arguments
>-            if [ x"$TERM" = x"screen" ]; then
>-                # screen has an incompatible meaning for -e
>-                sh -c "exec $terminal_exec $1"
>-            elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
>-                #TODO: Use whatever mechanism dash supports to test for
>-                #      rxvt-* to match things like rxvt-unicode-256color
>-                sh -c "exec $terminal_exec -e $1"
>-            else
>-                $terminal_exec -e "$1"
>+    # treat $TERM like $BROWSER to allow a fallback chain
>+    IFS=":"
>+    for terminal in $TERM; do
>+        unset IFS
>+        if [ x"$terminal" != x"" ]; then
>+            terminal_exec=`which $terminal 2>/dev/null`
>+
>+            if [ -x "$terminal_exec" ]; then
>+                if [ x"$1" = x"" ]; then
>+                    $terminal_exec
>+                else
>+                    # screen and urxvt won't do their own parsing of quoted arguments
>+                    if [ x"$TERM" = x"screen" ]; then
>+                        # screen has an incompatible meaning for -e
>+                        sh -c "exec $terminal_exec $1"
>+                    elif [ x"$TERM" = x"urxvt" ] || [ x"$TERM" = x"rxvt-unicode" ] || [ x"$TERM" = x"rxvt" ]; then
>+                        #TODO: Use whatever mechanism dash supports to test for
>+                        #      rxvt-* to match things like rxvt-unicode-256color
>+                        sh -c "exec $terminal_exec -e $1"
>+                    else
>+                        $terminal_exec -e "$1"
>+                    fi
>+                fi
>+
>+                if [ $? -eq 0 ]; then
>+                    exit_success
>+                else
>+                    exit_failure_operation_failed
>+                fi
>             fi
>         fi
>+    done
> 
>-        if [ $? -eq 0 ]; then
>-            exit_success
>-        else
>-            exit_failure_operation_failed
>-        fi
>-    else
>-        exit_failure_operation_impossible "configured terminal program '$TERM' not found or not executable"
>-    fi
>+    exit_failure_operation_impossible "configured terminal program '$TERM' not found or not executable"
> }
> 
> terminal_lxde()

Actions: View | Splinter Review

Attachments on bug 44359: 55013 | 57992

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.