Merge remote-tracking branch 'origin/pr/473'

* origin/pr/473:
  qubes-run-terminal: add gnome-console support

app-menu/Makefile

@@ -12,6 +12,7 @@ install:
 	install -d $(DESTDIR)$(BINDIR)
 	install -t $(DESTDIR)$(BINDIR) \
 		qubes-desktop-run \
+		qubes-run-gnome-console \
 		qubes-run-gnome-terminal \
 		qubes-run-terminal \
 		qubes-session-autostart

app-menu/qubes-run-gnome-console

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Wrapper around gnome-console that runs it with --wait option
+# (if supoported).
+
+# Check if our gnome-console version supports --wait
+# (we can't just run it and check exit code, because if it works, it will
+# return the exit code of the child process)
+case "$(kgx --help)" in
+    *--wait\ *) exec kgx --wait "$@" ;;
+    *)          exec kgx "$@" ;;
+esac

app-menu/qubes-run-terminal

@@ -15,6 +15,10 @@ if is_command gnome-terminal; then
     exec qubes-run-gnome-terminal
 fi
 
+if is_command kgx; then
+    exec qubes-run-gnome-console
+fi
+
 for terminal in xfce4-terminal konsole urxvt rxvt termit terminator Eterm aterm roxterm termite lxterminal mate-terminal terminology st xterm; do
     if is_command "$terminal" ; then
         exec "$terminal"

debian/qubes-core-agent.install

@@ -120,6 +120,7 @@ usr/bin/qubes-desktop-run
 usr/bin/qubes-open
 usr/bin/qubes-session-autostart
 usr/bin/qubes-run-terminal
+usr/bin/qubes-run-gnome-console
 usr/bin/qubes-run-gnome-terminal
 usr/bin/qubes-vmexec
 usr/bin/qvm-copy

rpm_spec/core-agent.spec.in

@@ -972,6 +972,7 @@ rm -f %{name}-%{version}
 %_bindir/qvm-sync-clock
 %_bindir/qubes-desktop-run
 %_bindir/qubes-run-terminal
+%_bindir/qubes-run-gnome-console
 %_bindir/qubes-run-gnome-terminal
 %_bindir/qubes-open
 %_bindir/qubes-session-autostart